projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update to new CONFIG_KERN.
[bertos.git]
/
bertos
/
cpu
/
avr
/
drv
/
adc_avr.c
diff --git
a/bertos/cpu/avr/drv/adc_avr.c
b/bertos/cpu/avr/drv/adc_avr.c
index fd8525d697d2ad35fa9ff8fa4c52f6e0204dd40d..942345a7466538e03a7c13a7a4b57896828afb8d 100644
(file)
--- a/
bertos/cpu/avr/drv/adc_avr.c
+++ b/
bertos/cpu/avr/drv/adc_avr.c
@@
-51,7
+51,7
@@
#define ADC_AVR_AVCC 1
#define ADC_AVR_INT256 2
#define ADC_AVR_AVCC 1
#define ADC_AVR_INT256 2
-#if CONFIG_KERN
EL
+#if CONFIG_KERN
#include <cfg/module.h>
#include <kern/proc.h>
#include <kern/signal.h>
#include <cfg/module.h>
#include <kern/proc.h>
#include <kern/signal.h>
@@
-75,7
+75,7
@@
{
sig_signal(adc_process, SIG_ADC_COMPLETE);
}
{
sig_signal(adc_process, SIG_ADC_COMPLETE);
}
-#endif /* CONFIG_KERN
EL
*/
+#endif /* CONFIG_KERN */
/**
* Select mux channel \a ch.
/**
* Select mux channel \a ch.
@@
-104,7
+104,7
@@
INLINE uint16_t adc_hw_read(void)
// Start convertion
ADCSRA |= BV(ADSC);
// Start convertion
ADCSRA |= BV(ADSC);
- #if CONFIG_KERN
EL
+ #if CONFIG_KERN
// Ensure IRQs enabled.
ASSERT(IRQ_ENABLED());
adc_process = proc_current();
// Ensure IRQs enabled.
ASSERT(IRQ_ENABLED());
adc_process = proc_current();
@@
-143,11
+143,11
@@
INLINE void adc_hw_init(void)
/* Disable Auto trigger source: ADC in Free running mode. */
ADCSRB = 0;
/* Disable Auto trigger source: ADC in Free running mode. */
ADCSRB = 0;
-
+
/* Enable ADC, disable autotrigger mode. */
ADCSRA = BV(ADEN);
/* Enable ADC, disable autotrigger mode. */
ADCSRA = BV(ADEN);
- #if CONFIG_KERN
EL
+ #if CONFIG_KERN
MOD_CHECK(proc);
ADCSRA |= BV(ADIE);
#endif
MOD_CHECK(proc);
ADCSRA |= BV(ADIE);
#endif