diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-15 22:29:45 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2011-02-16 01:17:21 -0500 |
| commit | 2764748208816043a3149eae3a433d02325a1a36 (patch) | |
| tree | cc5afb0af0c6f1d2282db08d3dad1dae9b4d33e6 /libmaple/adc.h | |
| parent | 1fb0e0d727089e23d4b30e1efba5410dc4b4da14 (diff) | |
| parent | 620740bf1986311041a40bd2992d1b549f84b2ba (diff) | |
| download | librambutan-2764748208816043a3149eae3a433d02325a1a36.tar.gz librambutan-2764748208816043a3149eae3a433d02325a1a36.zip | |
Merge branch 'nzmichaelh-master' into master.
This provides DMA, IWDG, PWR, and BKP support, and fixes several bugs.
Conflicts:
libmaple/adc.h
libmaple/libmaple.h
libmaple/ring_buffer.h
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 ce67116..fe1196f 100644 --- a/libmaple/adc.h +++ b/libmaple/adc.h @@ -66,15 +66,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-15], +/** + * Perform a single conversion on ADC[0-15]. * PRECONDITIONS: * adc initialized */ static inline int adc_read(int channel) { |