From: Keith Packard <keithp@keithp.com>
Date: Mon, 20 May 2013 03:07:52 +0000 (-0700)
Subject: altos/lpc: Pull ADC data from the correct registers
X-Git-Tag: 1.2.9.2~66^2~15
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d51c9fda3478f205e4bcdf1b7bf21eb1e0a516bc;p=fw%2Faltos

altos/lpc: Pull ADC data from the correct registers

Was just stepping through register space arbitrarily, which would have
worked for EasyMini, but might have failed later if the ADC pin usage
wasn't consecutive.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/lpc/ao_adc_lpc.c b/src/lpc/ao_adc_lpc.c
index 70e8b2d6..9ecc7c13 100644
--- a/src/lpc/ao_adc_lpc.c
+++ b/src/lpc/ao_adc_lpc.c
@@ -86,34 +86,38 @@ static uint8_t			ao_adc_ready;
 
 void  lpc_adc_isr(void)
 {
+	uint32_t	stat = lpc_adc.stat;
 	uint16_t	*out = (uint16_t *) &ao_data_ring[ao_data_head].adc;
 	vuint32_t	*in = &lpc_adc.dr[0];
 
+	lpc_adc.cr = 0;
+	lpc_adc.stat = 0;
+
 	/* Store converted values in packet */
 
 #if AO_ADC_0
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[0] >> 1;
 #endif
 #if AO_ADC_1
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[1] >> 1;
 #endif
 #if AO_ADC_2
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[2] >> 1;
 #endif
 #if AO_ADC_3
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[3] >> 1;
 #endif
 #if AO_ADC_4
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[4] >> 1;
 #endif
 #if AO_ADC_5
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[5] >> 1;
 #endif
 #if AO_ADC_6
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[6] >> 1;
 #endif
 #if AO_ADC_7
-	*out++ = ((uint16_t) *in++) >> 1;
+	*out++ = lpc_adc.dr[7] >> 1;
 #endif
 
 	AO_DATA_PRESENT(AO_DATA_ADC);