projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move mware/prog_avr module to drv/flash_avr; add kfile Ctor; merge flash read/write...
[bertos.git]
/
drv
/
adc.c
diff --git
a/drv/adc.c
b/drv/adc.c
index c2a4b409265532a052ed7acfaa785d68cb014921..6e2f1aeaf38f3f40e30e1c64f94d6f7ea0468349 100755
(executable)
--- a/
drv/adc.c
+++ b/
drv/adc.c
@@
-15,6
+15,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/09/20 17:32:46 marco
+ *#* Use MOD_* macros instead of DB.
+ *#*
*#* Revision 1.3 2006/09/13 18:30:07 bernie
*#* Add a FIXME.
*#*
*#* Revision 1.3 2006/09/13 18:30:07 bernie
*#* Add a FIXME.
*#*
@@
-33,11
+36,10
@@
// FIXME: move CPU specific part to adc_CPU.c
#include <hw_adc.h>
// FIXME: move CPU specific part to adc_CPU.c
#include <hw_adc.h>
-#include <cfg/debug.h>
-#include <cfg/macros.h>
+#include <cfg/debug.h>
// ASSERT()
+#include <cfg/macros.h>
// MIN()
#include <cfg/compiler.h>
#include <cfg/compiler.h>
-
-DB(bool adc_initialized = false;)
+#include <cfg/module.h>
/**
* Read the ADC channel \a ch.
/**
* Read the ADC channel \a ch.
@@
-52,6
+54,8
@@
adcread_t adc_read(uint16_t ch)
return(adc_hw_read());
}
return(adc_hw_read());
}
+MOD_DEFINE(adc)
+
/**
* Initialize the ADC hardware.
*/
/**
* Initialize the ADC hardware.
*/
@@
-61,6
+65,7
@@
void adc_init(void)
IRQ_SAVE_DISABLE(flags);
ADC_HW_INIT;
IRQ_SAVE_DISABLE(flags);
ADC_HW_INIT;
- DB(adc_initialized = true;)
IRQ_RESTORE(flags);
IRQ_RESTORE(flags);
+
+ MOD_INIT(adc);
}
}