X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcpu%2Farm%2Fdrv%2Fadc_at91.c;h=dbeb6117ffbc57e7da78be8bd5913e376bd30310;hb=36e34ca0af43a27f0092cc5217192b1c4a0ba104;hp=eed5fac6e97258f7e88088b7e958c57263b0b8c2;hpb=0fbabc305e65dfc5538cfcae10c04f6be9daf657;p=bertos.git

diff --git a/bertos/cpu/arm/drv/adc_at91.c b/bertos/cpu/arm/drv/adc_at91.c
index eed5fac6..dbeb6117 100644
--- a/bertos/cpu/arm/drv/adc_at91.c
+++ b/bertos/cpu/arm/drv/adc_at91.c
@@ -30,29 +30,33 @@
  *
  * -->
  *
- *
  * \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 <cfg/cfg_adc.h>
-#include <cfg/cfg_kern.h>
+#include "cfg/cfg_adc.h"
+#include "cfg/cfg_kern.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>
@@ -171,23 +175,23 @@ 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
 		//Register and enable irq for adc.