projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore demo as default app.
[bertos.git]
/
bertos
/
cpu
/
arm
/
drv
/
adc_at91.c
diff --git
a/bertos/cpu/arm/drv/adc_at91.c
b/bertos/cpu/arm/drv/adc_at91.c
index eed5fac6e97258f7e88088b7e958c57263b0b8c2..3ebbfa75be80dd25d186b8f0cb606b74f4006c58 100644
(file)
--- a/
bertos/cpu/arm/drv/adc_at91.c
+++ b/
bertos/cpu/arm/drv/adc_at91.c
@@
-35,24
+35,30
@@
*
* 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
*
* 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$
* 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>
*/
* \author Daniele Basile <asterix@develer.com>
*/
+
#include "adc_at91.h"
#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>
#include <cfg/macros.h>
#include <cfg/compiler.h>
+// Define logging setting (for cfg/log.h module).
+#define LOG_LEVEL ADC_LOG_LEVEL
+#define LOG_VERBOSITY ADC_LOG_VERBOSITY
+#include <cfg/log.h>
+
#include <drv/adc.h>
#include <io/arm.h>
#include <drv/adc.h>
#include <io/arm.h>
@@
-171,23
+177,23
@@
INLINE void adc_hw_init(void)
#endif
/* \} */
#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);
//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);
//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);
//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.
#if CONFIG_KERNEL
//Register and enable irq for adc.