X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fdrv%2Fadc_at91.c;h=7fd50ddf24eae8ff05fe80a0f3b21953720de41e;hb=32d1445272120a254d77ce8d1af1f527da7a2c17;hp=d8cea88a7c4c467c1d1113eda189dfb60e056524;hpb=c22fe24a0da896a52dbc3882390ec18a440ef56a;p=bertos.git

diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c
index d8cea88a..7fd50ddf 100644
--- a/bertos/cpu/arm/drv/adc_at91.c
+++ b/bertos/cpu/arm/drv/adc_at91.c
@@ -30,34 +30,41 @@
  *
  * -->
  *
- *
  * \brief ADC hardware-specific implementation
  *
  * This ADC module should be use both whit kernel or none.
  * If you are using a kernel, the adc drive does not wait the finish of
- * conversion but use a singal every time a required conversion are 
- * ended. This signal wake up a process that return a result of 
+ * conversion but use a singal every time a required conversion are
+ * ended. This signal wake up a process that return a result of
  * conversion. Otherwise, if you not use a kernl, this module wait
  * whit a loop the finishing of conversion.
  *
  *
  * \version $Id$
- * 
  * \author Daniele Basile <asterix@develer.com>
  */
 
+
 #include "adc_at91.h"
 
+#include <cpu/irq.h>
+
 #include "cfg/cfg_adc.h"
-#include "cfg/cfg_kern.h"
+#include "cfg/cfg_proc.h"
+#include "cfg/cfg_signal.h"
 #include <cfg/macros.h>
 #include <cfg/compiler.h>
 
+// Define log settings for cfg/log.h.
+#define LOG_LEVEL         ADC_LOG_LEVEL
+#define LOG_FORMAT        ADC_LOG_FORMAT
+#include <cfg/log.h>
+
 #include <drv/adc.h>
 
 #include <io/arm.h>
 
-#if CONFIG_KERNEL
+#if CONFIG_KERN
 	#include <cfg/module.h>
 	#include <kern/proc.h>
 	#include <kern/signal.h>
@@ -77,7 +84,7 @@
 	 * ADC ISR.
 	 * Simply signal the adc process that convertion is complete.
 	 */
-	static void ISR_FUNC adc_conversion_end_irq(void)
+	static DECLARE_ISR(adc_conversion_end_irq)
 	{
 		sig_signal(adc_process, SIG_ADC_COMPLETE);
 
@@ -100,14 +107,14 @@
 		ADC_IER = BV(ADC_DRDY);
 	}
 
-#endif /* CONFIG_KERNEL */
+#endif /* CONFIG_KERN */
 
 
 /**
  * Select mux channel \a ch.
  * \todo only first 8 channels are selectable!
  */
-INLINE void adc_hw_select_ch(uint8_t ch)
+void adc_hw_select_ch(uint8_t ch)
 {
 	//Disable all channels
 	ADC_CHDR = ADC_CH_MASK;
@@ -119,36 +126,42 @@ INLINE void adc_hw_select_ch(uint8_t ch)
 /**
  * Start an ADC convertion.
  * If a kernel is present, preempt until convertion is complete, otherwise
- * a busy wait on ADCS bit is done.
+ * a busy wait on ADC_DRDY bit is done.
  */
-INLINE uint16_t adc_hw_read(void)
+uint16_t adc_hw_read(void)
 {
-	ASSERT(!(ADC_SR & ADC_EOC_MASK));
-
-	#if CONFIG_KERNEL
+	#if CONFIG_KERN
+		/* Ensure ADC is not already in use by another process */
+		ASSERT(adc_process == NULL);
 		adc_process = proc_current();
 	#endif
 
 	// Start convertion
 	ADC_CR = BV(ADC_START);
 
-	#if CONFIG_KERNEL
+	#if CONFIG_KERN
 		// Ensure IRQs enabled.
-		ASSERT(IRQ_ENABLED());
+		IRQ_ASSERT_ENABLED();
 		sig_wait(SIG_ADC_COMPLETE);
+
+		/* Prevent race condition in case of preemptive kernel */
+		uint16_t ret = ADC_LCDR;
+		MEMORY_BARRIER;
+		adc_process = NULL;
+		return ret;
 	#else
 		//Wait in polling until is done
 		while (!(ADC_SR & BV(ADC_DRDY)));
-	#endif
 
-	//Return the last converted data
-	return(ADC_LCDR);
+		//Return the last converted data
+		return(ADC_LCDR);
+	#endif
 }
 
 /**
  * Init ADC hardware.
  */
-INLINE void adc_hw_init(void)
+void adc_hw_init(void)
 {
 	//Init ADC pins.
 	ADC_INIT_PINS();
@@ -171,25 +184,25 @@ INLINE void adc_hw_init(void)
 	#endif
 	/* \} */
 
-	TRACEMSG("prescaler[%ld], stup[%ld], shtim[%ld]\n",ADC_COMPUTED_PRESCALER,ADC_COMPUTED_STARTUPTIME,ADC_COMPUTED_SHTIME);
+	LOG_INFO("prescaler[%ld], stup[%ld], shtim[%ld]\n",ADC_COMPUTED_PRESCALER, ADC_COMPUTED_STARTUPTIME,  ADC_COMPUTED_SHTIME);
 
 
 	//Apply computed prescaler value
 	ADC_MR &= ~ADC_PRESCALER_MASK;
 	ADC_MR |= ((ADC_COMPUTED_PRESCALER << ADC_PRESCALER_SHIFT) & ADC_PRESCALER_MASK);
-	TRACEMSG("prescaler[%ld]\n", (ADC_COMPUTED_PRESCALER << ADC_PRESCALER_SHIFT) & ADC_PRESCALER_MASK);
+	LOG_INFO("prescaler[%ld]\n", (ADC_COMPUTED_PRESCALER << ADC_PRESCALER_SHIFT) & ADC_PRESCALER_MASK);
 
 	//Apply computed start up time
 	ADC_MR &= ~ADC_STARTUP_MASK;
 	ADC_MR |= ((ADC_COMPUTED_STARTUPTIME << ADC_STARTUP_SHIFT) & ADC_STARTUP_MASK);
-	TRACEMSG("sttime[%ld]\n", (ADC_COMPUTED_STARTUPTIME << ADC_STARTUP_SHIFT) & ADC_STARTUP_MASK);
+	LOG_INFO("sttime[%ld]\n", (ADC_COMPUTED_STARTUPTIME << ADC_STARTUP_SHIFT) & ADC_STARTUP_MASK);
 
 	//Apply computed sample and hold time
 	ADC_MR &= ~ADC_SHTIME_MASK;
 	ADC_MR |= ((ADC_COMPUTED_SHTIME << ADC_SHTIME_SHIFT) & ADC_SHTIME_MASK);
-	TRACEMSG("shtime[%ld]\n", (ADC_COMPUTED_SHTIME << ADC_SHTIME_SHIFT) & ADC_SHTIME_MASK);
+	LOG_INFO("shtime[%ld]\n", (ADC_COMPUTED_SHTIME << ADC_SHTIME_SHIFT) & ADC_SHTIME_MASK);
 
-	#if CONFIG_KERNEL
+	#if CONFIG_KERN
 		//Register and enable irq for adc.
 		adc_enable_irq();
 	#endif