diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-30 23:07:01 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-30 23:07:01 -0500 |
| commit | fc727d99ac3f3d98eeba925fbbfee5cae2e7f8a4 (patch) | |
| tree | 2df4fea51e0a28a2364a13303a4673d0fefad7f8 /libmaple/adc.h | |
| parent | 8e973f3d1ef0324e213824dc05af0f9713e7b3cb (diff) | |
| download | librambutan-fc727d99ac3f3d98eeba925fbbfee5cae2e7f8a4.tar.gz librambutan-fc727d99ac3f3d98eeba925fbbfee5cae2e7f8a4.zip | |
nzmichaelh-master branch is ready for code review.
Diffstat (limited to 'libmaple/adc.h')
| -rw-r--r-- | libmaple/adc.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmaple/adc.h b/libmaple/adc.h index f41044f..776768e 100644 --- a/libmaple/adc.h +++ b/libmaple/adc.h @@ -65,15 +65,16 @@ extern "C"{ #define CR2_ADON_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 0)) #define CR2_CAL_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 2)) #define CR2_RSTCAL_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 3)) -#define CR2_SWSTART_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8 + 2, 6)) +#define CR2_SWSTART_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0x8, 22)) #define SR_EOC_BIT *(volatile uint32*)(BITBAND_PERI(ADC1_BASE+0, 1)) /* (NR_ANALOG_PINS is board specific) */ -/* Initialize ADC1 to do one-shot conversions */ +/** Initialize ADC1 to do one-shot conversions */ void adc_init(void); void adc_disable(void); -/* Perform a single conversion on ADC[0-16], +/** + * Perform a single conversion on ADC[0-16], * PRECONDITIONS: * adc initialized */ static inline int adc_read(int channel) { |