diff options
| author | Keith Packard <keithp@keithp.com> | 2015-02-28 15:59:30 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-02-28 16:10:10 -0800 |
| commit | 27aef593fb4c037fdb65c9fb397829b42d72d0f2 (patch) | |
| tree | 2f486084b10b616ed7b9d12bc949908c5dd7aedc /src/stmf0/ao_adc_fast.h | |
| parent | ec2d758844202108b446e6b12ec1da8812ceb265 (diff) | |
altos/stmf0: Fix fast ADC interface
This was configuring the hardware wrong, and wasn't keeping the output
ring full.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/stmf0/ao_adc_fast.h')
| -rw-r--r-- | src/stmf0/ao_adc_fast.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/stmf0/ao_adc_fast.h b/src/stmf0/ao_adc_fast.h index eec45505..ca5f7fb9 100644 --- a/src/stmf0/ao_adc_fast.h +++ b/src/stmf0/ao_adc_fast.h @@ -26,15 +26,13 @@ ao_adc_init(void); /* Total ring size in samples */ #define AO_ADC_RING_SIZE 256 -/* Number of samples fetched per ao_adc_start call */ -#define AO_ADC_RING_CHUNK (AO_ADC_RING_SIZE >> 1) extern uint16_t ao_adc_ring[AO_ADC_RING_SIZE]; #define ao_adc_ring_step(pos,inc) (((pos) + (inc)) & (AO_ADC_RING_SIZE - 1)) extern uint16_t ao_adc_ring_head, ao_adc_ring_tail; -extern uint8_t ao_adc_running; +extern uint16_t ao_adc_running; void _ao_adc_start(void); @@ -50,9 +48,7 @@ _ao_adc_remain(void) static inline uint16_t _ao_adc_space(void) { - if (ao_adc_ring_head == ao_adc_ring_tail) - return AO_ADC_RING_SIZE; - if (ao_adc_ring_head > ao_adc_ring_tail) + if (ao_adc_ring_head >= ao_adc_ring_tail) return AO_ADC_RING_SIZE - ao_adc_ring_head; return ao_adc_ring_tail - ao_adc_ring_head; } @@ -81,7 +77,7 @@ ao_adc_ack(uint16_t n) ao_adc_ring_tail += n; if (ao_adc_ring_tail == AO_ADC_RING_SIZE) ao_adc_ring_tail = 0; - if (!ao_adc_running && _ao_adc_space() >= AO_ADC_RING_CHUNK) + if (!ao_adc_running) _ao_adc_start(); ao_arch_release_interrupts(); } |