From 639149a8abbe3c41e62cb3986f5df8509209ca2f Mon Sep 17 00:00:00 2001
From: Marti Bolivar <mbolivar@leaflabs.com>
Date: Wed, 18 May 2011 20:23:56 -0400
Subject: adc.c: adc_init() doesn't set the RCC's ADC prescaler.

You have to call rcc_set_prescaler() yourself now.  adc_init() never
should have been doing that anyway.
---
 libmaple/adc.c    | 5 ++---
 wirish/boards.cpp | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libmaple/adc.c b/libmaple/adc.c
index 73dce0a..16ca8bc 100644
--- a/libmaple/adc.c
+++ b/libmaple/adc.c
@@ -62,13 +62,12 @@ const adc_dev *ADC3 = &adc3;
 /**
  * @brief Initialize an ADC peripheral.
  *
- * Initializes the RCC clock line for the given peripheral, using ADC
- * prescaler RCC_ADCPRE_PCLK_DIV_6.  Resets ADC device registers.
+ * Initializes the RCC clock line for the given peripheral.  Resets
+ * ADC device registers.
  *
  * @param dev ADC peripheral to initialize
  */
 void adc_init(const adc_dev *dev) {
-    rcc_set_prescaler(RCC_PRESCALER_ADC, RCC_ADCPRE_PCLK_DIV_6);
     rcc_clk_enable(dev->clk_id);
     rcc_reset_dev(dev->clk_id);
 }
diff --git a/wirish/boards.cpp b/wirish/boards.cpp
index 9e25eeb..3dc48cb 100644
--- a/wirish/boards.cpp
+++ b/wirish/boards.cpp
@@ -106,6 +106,7 @@ static void setupNVIC() {
 static void adcDefaultConfig(const adc_dev* dev);
 
 static void setupADC() {
+    rcc_set_prescaler(RCC_PRESCALER_ADC, RCC_ADCPRE_PCLK_DIV_6);
     adc_foreach(adcDefaultConfig);
 }
 
-- 
cgit v1.2.3