From d0b4e926ecececa7499a301b6135189be119512e Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 22 May 2013 13:03:06 -0700
Subject: Initial TeleMini bits

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c | 5 +++++
 src/cc1111/ao_usb.c | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 4a58023d..6cc08399 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -162,6 +162,11 @@ ao_adc_isr(void) __interrupt 1
 #define GOT_ADC
 #endif	
 
+#ifdef FETCH_ADC
+	FETCH_ADC()
+#define GOT_ADC
+#endif
+
 #ifndef GOT_ADC
 #error No known ADC configuration set
 #endif
diff --git a/src/cc1111/ao_usb.c b/src/cc1111/ao_usb.c
index a655d1be..b0ab409d 100644
--- a/src/cc1111/ao_usb.c
+++ b/src/cc1111/ao_usb.c
@@ -201,6 +201,11 @@ ao_usb_ep0_setup(void)
 				ao_usb_ep0_queue_byte(0);
 				break;
 			case AO_USB_REQ_SET_ADDRESS:
+#if USB_FORCE_FLIGHT_IDLE
+				/* Go to idle mode if USB is connected
+				 */
+				ao_flight_force_idle = 1;
+#endif
 				ao_usb_set_address(ao_usb_setup.value);
 				break;
 			case AO_USB_REQ_GET_DESCRIPTOR:
-- 
cgit v1.2.3


From 312f6194a4bc75473cb0d61a6d58b66fb1f7c068 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Wed, 12 Jun 2013 00:43:31 -0700
Subject: altos/teletiny-v2.0: Support multiple SPI busses on CC1111

Needed for TeleMini v2.0

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_arch.h            |   5 +
 src/cc1111/ao_arch_funcs.h      |  82 +++++++++----
 src/cc1111/ao_spi.c             | 257 +++++++++++++++++++++++++---------------
 src/drivers/ao_ms5607.c         |   2 +-
 src/telemini-v2.0/ao_pins.h     |   4 +
 src/telemini-v2.0/ao_telemini.c |   1 +
 6 files changed, 231 insertions(+), 120 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 9097557f..34235b08 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -321,4 +321,9 @@ void
 ao_serial1_tx_isr(void) ao_arch_interrupt(14);
 #endif
 
+#if HAS_EXTI_0
+void
+ao_p0_isr(void) __interrupt(13);
+#endif
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 8f1cc094..ae184108 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -19,46 +19,74 @@
  * ao_spi.c
  */
 
-extern __xdata uint8_t	ao_spi_mutex;
+#if !HAS_SPI_0 && !HAS_SPI_1
+#define HAS_SPI_0	1
+#define SPI_0_ALT_2	1
+#endif
+
+#if HAS_SPI_0 && HAS_SPI_1
+#define MULTI_SPI	1
+#define N_SPI		2
+#else
+#define MULTI_SPI	0
+#define N_SPI		1
+#endif
+
+extern __xdata uint8_t	ao_spi_mutex[N_SPI];
+
+#if MULTI_SPI
+#define ao_spi_get(bus)	ao_mutex_get(&ao_spi_mutex[bus])
+#define ao_spi_put(bus)	ao_mutex_put(&ao_spi_mutex[bus])
+#else
+#define ao_spi_get(bus)	ao_mutex_get(&ao_spi_mutex[0])
+#define ao_spi_put(bus)	ao_mutex_put(&ao_spi_mutex[0])
+#endif
 
 #define AO_SPI_SPEED_FAST	17
 #define AO_SPI_SPEED_200kHz	13
 
-#define ao_spi_set_speed(speed) (U0GCR = (UxGCR_CPOL_NEGATIVE |		\
-					  UxGCR_CPHA_FIRST_EDGE |	\
-					  UxGCR_ORDER_MSB |		\
-					  ((speed) << UxGCR_BAUD_E_SHIFT)))
+#if MULTI_SPI
+#define ao_spi_set_speed(bus,speed) (*(bus ? &U1GCR : &U0GCR) =(UxGCR_CPOL_NEGATIVE | \
+								UxGCR_CPHA_FIRST_EDGE |	\
+								UxGCR_ORDER_MSB | \
+								((speed) << UxGCR_BAUD_E_SHIFT)))
+#else
+#define ao_spi_set_speed(bus,speed) (U0GCR = (UxGCR_CPOL_NEGATIVE |	\
+					      UxGCR_CPHA_FIRST_EDGE |	\
+					      UxGCR_ORDER_MSB |		\
+					      ((speed) << UxGCR_BAUD_E_SHIFT)))
+#endif
 
 #define ao_spi_get_slave(bus) do {			\
-		ao_mutex_get(&ao_spi_mutex);		\
-		ao_spi_set_speed(AO_SPI_SPEED_FAST);	\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,AO_SPI_SPEED_FAST);	\
 	} while (0)
 
 #define ao_spi_put_slave(bus) do {		\
-		ao_mutex_put(&ao_spi_mutex);	\
+		ao_spi_put(bus);		\
 	} while (0)
 
 #define ao_spi_get_mask(reg,mask,bus,speed) do {	\
-		ao_mutex_get(&ao_spi_mutex);		\
-		ao_spi_set_speed(speed);		\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,speed);		\
 		(reg) &= ~(mask);			\
 	} while (0)
 
 #define ao_spi_put_mask(reg,mask,bus) do {		\
 	(reg) |= (mask); \
-	ao_mutex_put(&ao_spi_mutex); \
+	ao_spi_put(bus); \
 	} while (0)
 
 
 #define ao_spi_get_bit(reg,bit,pin,bus,speed) do {	\
-		ao_mutex_get(&ao_spi_mutex);	\
-		ao_spi_set_speed(speed);	\
-		pin = 0;			\
+		ao_spi_get(bus);			\
+		ao_spi_set_speed(bus,speed);		\
+		pin = 0;				\
 	} while (0)
 
 #define ao_spi_put_bit(reg,bit,pin,bus) do {	\
 		pin = 1;			\
-		ao_mutex_put(&ao_spi_mutex);	\
+		ao_spi_put(bus);		\
 	} while (0)
 
 
@@ -68,6 +96,13 @@ extern __xdata uint8_t	ao_spi_mutex;
  * from chip select low to chip select high
  */
 
+#if MULTI_SPI
+void
+ao_spi_send(void __xdata *block, uint16_t len, uint8_t bus) __reentrant;
+
+void
+ao_spi_recv(void __xdata *block, uint16_t len, uint8_t bus) __reentrant;
+#else
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant;
 
@@ -76,6 +111,7 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant;
 
 #define ao_spi_send(block, len, bus) ao_spi_send_bus(block, len)
 #define ao_spi_recv(block, len, bus) ao_spi_recv_bus(block, len)
+#endif
 
 #if AO_SPI_SLAVE
 void
@@ -88,10 +124,15 @@ ao_spi_recv_wait(void);
 void
 ao_spi_init(void);
 
-#define ao_spi_init_cs(port, mask) do {		\
-		SPI_CS_PORT |= mask;		\
-		SPI_CS_DIR |= mask;		\
-		SPI_CS_SEL &= ~mask;		\
+#define token_paster(x,y)	x ## y
+#define token_paster3(x,y,z)	x ## y ## z
+#define token_evaluator(x,y)	token_paster(x,y)
+#define token_evaluator3(x,y,z)	token_paster3(x,y,z)
+
+#define ao_spi_init_cs(port, mask) do {			\
+		port |= mask;				\
+		token_evaluator(port,DIR) |= mask;	\
+		token_evaluator(port,SEL) &= ~mask;	\
 	} while (0)
 
 #define cc1111_enable_output(port,dir,sel,pin,bit,v) do {	\
@@ -102,7 +143,6 @@ ao_spi_init(void);
 
 #define disable_unreachable	_Pragma("disable_warning 126")
 
-#define token_paster(x,y)	x ## y
-#define token_evaluator(x,y)	token_paster(x,y)
 #define ao_enable_output(port,bit,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), pin, bit, v)
 #define ao_gpio_set(port, bit, pin, v) ((pin) = (v))
+
diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index cdef6bda..fb08f3f5 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -18,10 +18,6 @@
 #include "ao.h"
 
 /* Default pin usage for existing Altus Metrum devices */
-#if !HAS_SPI_0 && !HAS_SPI_1
-#define HAS_SPI_0	1
-#define SPI_0_ALT_2	1
-#endif
 
 #ifndef SPI_CONST
 #define SPI_CONST	0xff
@@ -61,62 +57,107 @@
  */
 
 #if HAS_SPI_0
-#define SPI_CSR		U0CSR
-#define SPI_BUF		U0DBUFXADDR
-#define SPI_BAUD	U0BAUD
-#define SPI_GCR		U0GCR
-#define SPI_CFG_MASK	PERCFG_U0CFG_ALT_MASK
-#define SPI_DMA_TX	DMA_CFG0_TRIGGER_UTX0
-#define SPI_DMA_RX	DMA_CFG0_TRIGGER_URX0
+#define SPI_BUF_0	&U0DBUFXADDR
+#define SPI_CSR_0	U0CSR
+#define SPI_BAUD_0	U0BAUD
+#define SPI_GCR_0	U0GCR
+#define SPI_CFG_MASK_0	PERCFG_U0CFG_ALT_MASK
+#define SPI_DMA_TX_0	DMA_CFG0_TRIGGER_UTX0
+#define SPI_DMA_RX_0	DMA_CFG0_TRIGGER_URX0
 
 #if SPI_0_ALT_1
-#define SPI_CFG		PERCFG_U0CFG_ALT_1
-#define SPI_SEL		P0SEL
-#define SPI_BITS	(1 << 3) | (1 << 2) | (1 << 5)
-#define SPI_CSS_BIT	(1 << 4)
+#define SPI_CFG_0	PERCFG_U0CFG_ALT_1
+#define SPI_SEL_0	P0SEL
+#define SPI_BITS_0	(1 << 3) | (1 << 2) | (1 << 5)
+#define SPI_CSS_BIT_0	(1 << 4)
 #endif
 
 #if SPI_0_ALT_2
-#define SPI_CFG		PERCFG_U0CFG_ALT_2
-#define SPI_SEL		P1SEL
-#define SPI_PRI		P2SEL_PRI3P1_USART0
-#define SPI_BITS	(1 << 5) | (1 << 4) | (1 << 3)
-#define SPI_CSS_BIT	(1 << 2)
+#define SPI_CFG_0	PERCFG_U0CFG_ALT_2
+#define SPI_SEL_0	P1SEL
+#define SPI_PRI_0	P2SEL_PRI3P1_USART0
+#define SPI_BITS_0	(1 << 5) | (1 << 4) | (1 << 3)
+#define SPI_CSS_BIT_0	(1 << 2)
 #endif
 
 #endif
 
 #if HAS_SPI_1
-#define SPI_CSR		U1CSR
-#define SPI_BUF		U1DBUFXADDR
-#define SPI_BAUD	U1BAUD
-#define SPI_GCR		U1GCR
-#define SPI_CFG_MASK	PERCFG_U1CFG_ALT_MASK
-#define SPI_DMA_TX	DMA_CFG0_TRIGGER_UTX1
-#define SPI_DMA_RX	DMA_CFG0_TRIGGER_URX1
+#define SPI_BUF_1	&U1DBUFXADDR
+#define SPI_CSR_1	U1CSR
+#define SPI_BAUD_1	U1BAUD
+#define SPI_GCR_1	U1GCR
+#define SPI_CFG_MASK_1	PERCFG_U1CFG_ALT_MASK
+#define SPI_DMA_TX_1	DMA_CFG0_TRIGGER_UTX1
+#define SPI_DMA_RX_1	DMA_CFG0_TRIGGER_URX1
 
 #if SPI_1_ALT_1
-#define SPI_CFG		PERCFG_U1CFG_ALT_1
-#define SPI_SEL		P0SEL
-#define SPI_BITS	(1 << 4) | (1 << 5) | (1 << 3)
-#define SPI_CSS_BIT	(1 << 2)
+#define SPI_CFG_1	PERCFG_U1CFG_ALT_1
+#define SPI_SEL_1	P0SEL
+#define SPI_BITS_1	(1 << 4) | (1 << 5) | (1 << 3)
+#define SPI_CSS_BIT_1	(1 << 2)
 #endif
 
 #if SPI_1_ALT_2
-#define SPI_CFG		PERCFG_U1CFG_ALT_2
-#define SPI_SEL		P1SEL
-#define SPI_PRI		P2SEL_PRI3P1_USART1
-#define SPI_BITS	(1 << 6) | (1 << 7) | (1 << 5)
-#define SPI_CSS_BIT	(1 << 4)
+#define SPI_CFG_1	PERCFG_U1CFG_ALT_2
+#define SPI_SEL_1	P1SEL
+#define SPI_PRI_1	P2SEL_PRI3P1_USART1
+#define SPI_BITS_1	(1 << 6) | (1 << 7) | (1 << 5)
+#define SPI_CSS_BIT_1	(1 << 4)
 #endif
 
 #endif
 
+#if MULTI_SPI
+
+#define SPI_BUF(bus)		((bus) ? SPI_BUF_1 : SPI_BUF_0)
+#define SPI_CSR(bus)		((bus) ? SPI_CSR_1 : SPI_CSR_0)
+#define SPI_BAUD(bus)		((bus) ? SPI_BAUD_1 : SPI_BAUD_0)
+#define SPI_GCR(bus)		((bus) ? SPI_GCR_1 : SPI_GCR_0)
+#define SPI_CFG_MASK(bus)	((bus) ? SPI_CFG_MASK_1 : SPI_CFG_MASK_0)
+#define SPI_DMA_TX(bus)		((bus) ? SPI_DMA_TX_1 : SPI_DMA_TX_0)
+#define SPI_DMA_RX(bus)		((bus) ? SPI_DMA_RX_1 : SPI_DMA_RX_0)
+#define SPI_CFG(bus)		((bus) ? SPI_CFG_1 : SPI_CFG_0)
+#define SPI_SEL(bus)		((bus) ? SPI_SEL_1 : SPI_SEL_0)
+#define SPI_BITS(bus)		((bus) ? SPI_BITS_1 : SPI_BITS_0)
+#define SPI_CSS_BIT(bus)	((bus) ? SPI_CSS_BIT_1 : SPI_CSS_BIT_0)
+
+#else
+
+#if HAS_SPI_0
+#define SPI_BUF(bus)		SPI_BUF_0
+#define SPI_CSR(bus)		SPI_CSR_0
+#define SPI_BAUD(bus)		SPI_BAUD_0
+#define SPI_GCR(bus)		SPI_GCR_0
+#define SPI_CFG_MASK(bus)	SPI_CFG_MASK_0
+#define SPI_DMA_TX(bus)		SPI_DMA_TX_0
+#define SPI_DMA_RX(bus)		SPI_DMA_RX_0
+#define SPI_CFG(bus)		SPI_CFG_0
+#define SPI_SEL(bus)		SPI_SEL_0
+#define SPI_BITS(bus)		SPI_BITS_0
+#define SPI_CSS_BIT(bus)	SPI_CSS_BIT_0
+#endif
+#if HAS_SPI_1
+#define SPI_BUF(bus)		SPI_BUF_1
+#define SPI_CSR(bus)		SPI_CSR_1
+#define SPI_BAUD(bus)		SPI_BAUD_1
+#define SPI_GCR(bus)		SPI_GCR_1
+#define SPI_CFG_MASK(bus)	SPI_CFG_MASK_1
+#define SPI_DMA_TX(bus)		SPI_DMA_TX_1
+#define SPI_DMA_RX(bus)		SPI_DMA_RX_1
+#define SPI_CFG(bus)		SPI_CFG_1
+#define SPI_SEL(bus)		SPI_SEL_1
+#define SPI_BITS(bus)		SPI_BITS_1
+#define SPI_CSS_BIT(bus)	SPI_CSS_BIT_1
+#endif
+
+#endif /* MULTI_SPI */
+
 #if AO_SPI_SLAVE
-#define CSS		SPI_CSS_BIT
+#define CSS(bus)		SPI_CSS_BIT(bus)
 #define UxCSR_DIRECTION	UxCSR_SLAVE
 #else
-#define CSS		0
+#define CSS(bus)		0
 #define UxCSR_DIRECTION	UxCSR_MASTER
 #endif
 
@@ -124,15 +165,16 @@
  * operation, from CS low to CS high. This means that any SPI
  * user must protect the SPI bus with this mutex
  */
-__xdata uint8_t	ao_spi_mutex;
-__xdata uint8_t ao_spi_dma_in_done;
-__xdata uint8_t ao_spi_dma_out_done;
+__xdata uint8_t	ao_spi_mutex[N_SPI];
+__xdata uint8_t ao_spi_dma_in_done[N_SPI];
+__xdata uint8_t ao_spi_dma_out_done[N_SPI];
 
-uint8_t	ao_spi_dma_out_id;
-uint8_t ao_spi_dma_in_id;
+uint8_t	ao_spi_dma_out_id[N_SPI];
+uint8_t ao_spi_dma_in_id[N_SPI];
 
 static __xdata uint8_t ao_spi_const;
 
+
 /* Send bytes over SPI.
  *
  * This sets up two DMA engines, one writing the data and another reading
@@ -140,45 +182,52 @@ static __xdata uint8_t ao_spi_const;
  * is complete, as the transmit register is double buffered and hence signals
  * completion one byte before the transfer is actually complete
  */
+#if MULTI_SPI
+void
+ao_spi_send(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus	0
+#endif
 {
-	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &SPI_BUF,
+	ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+			    SPI_BUF(bus),
 			    &ao_spi_const,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_RX,
+			    SPI_DMA_RX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
-	ao_dma_set_transfer(ao_spi_dma_out_id,
+	ao_dma_set_transfer(ao_spi_dma_out_id[bus],
 			    block,
-			    &SPI_BUF,
+			    SPI_BUF(bus),
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_TX,
+			    SPI_DMA_TX(bus),
 			    DMA_CFG1_SRCINC_1 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 
-	ao_dma_start(ao_spi_dma_in_id);
-	ao_dma_start(ao_spi_dma_out_id);
-	ao_dma_trigger(ao_spi_dma_out_id);
+	ao_dma_start(ao_spi_dma_in_id[bus]);
+	ao_dma_start(ao_spi_dma_out_id[bus]);
+	ao_dma_trigger(ao_spi_dma_out_id[bus]);
 #if !AO_SPI_SLAVE
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[bus])
+		ao_sleep(&ao_spi_dma_in_done[bus]);
 #endif
+#undef bus
 }
 
 #if AO_SPI_SLAVE
 void
 ao_spi_send_wait(void)
 {
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[0])
+		ao_sleep(&ao_spi_dma_in_done[0]);
 }
 #endif
 
@@ -188,16 +237,22 @@ ao_spi_send_wait(void)
  * writing constant values to the SPI transmitter as that is what
  * clocks the data coming in.
  */
+#if MULTI_SPI
+void
+ao_spi_recv(void __xdata *block, uint16_t len, uint8_t bus) __reentrant
+#else
 void
 ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
+#define bus 0
+#endif
 {
-	ao_dma_set_transfer(ao_spi_dma_in_id,
-			    &SPI_BUF,
+	ao_dma_set_transfer(ao_spi_dma_in_id[bus],
+			    SPI_BUF(bus),
 			    block,
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_RX,
+			    SPI_DMA_RX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_1 |
 			    DMA_CFG1_PRIORITY_NORMAL);
@@ -205,24 +260,24 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 	ao_spi_const = SPI_CONST;
 
 #if !AO_SPI_SLAVE
-	ao_dma_set_transfer(ao_spi_dma_out_id,
+	ao_dma_set_transfer(ao_spi_dma_out_id[bus],
 			    &ao_spi_const,
-			    &SPI_BUF,
+			    SPI_BUF(bus),
 			    len,
 			    DMA_CFG0_WORDSIZE_8 |
 			    DMA_CFG0_TMODE_SINGLE |
-			    SPI_DMA_TX,
+			    SPI_DMA_TX(bus),
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 #endif
 
-	ao_dma_start(ao_spi_dma_in_id);
+	ao_dma_start(ao_spi_dma_in_id[bus]);
 #if !AO_SPI_SLAVE
-	ao_dma_start(ao_spi_dma_out_id);
-	ao_dma_trigger(ao_spi_dma_out_id);
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	ao_dma_start(ao_spi_dma_out_id[bus]);
+	ao_dma_trigger(ao_spi_dma_out_id[bus]);
+	__critical while (!ao_spi_dma_in_done[bus])
+		ao_sleep(&ao_spi_dma_in_done[bus]);
 #endif
 }
 
@@ -230,17 +285,43 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 void
 ao_spi_recv_wait(void)
 {
-	__critical while (!ao_spi_dma_in_done)
-		ao_sleep(&ao_spi_dma_in_done);
+	__critical while (!ao_spi_dma_in_done[0])
+		ao_sleep(&ao_spi_dma_in_done[0]);
 }
 #endif
 
+/* Set up the USART.
+ *
+ * SPI master/slave mode
+ */
+/* Set the baud rate and signal parameters
+ *
+ * The cc1111 is limited to a 24/8 MHz SPI clock.
+ * Every peripheral I've ever seen goes faster than that,
+ * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
+ */
+#define SPI_INIT(bus,o)	do {						\
+		/* Set up the USART pin assignment */			\
+		PERCFG = (PERCFG & ~SPI_CFG_MASK(bus)) | SPI_CFG(bus);	\
+									\
+		/* Make the SPI pins be controlled by the USART peripheral */ \
+		SPI_SEL(bus) |= SPI_BITS(bus) | CSS(bus);		\
+		SPI_CSR(bus) = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION); \
+		SPI_BAUD(bus) = 0;					\
+		SPI_GCR(bus) = (UxGCR_CPOL_NEGATIVE |			\
+				UxGCR_CPHA_FIRST_EDGE |			\
+				UxGCR_ORDER_MSB |			\
+				(17 << UxGCR_BAUD_E_SHIFT));		\
+		/* Set up OUT DMA */					\
+		ao_spi_dma_out_id[o] = ao_dma_alloc(&ao_spi_dma_out_done[o]); \
+									\
+		/* Set up IN DMA */					\
+		ao_spi_dma_in_id[o] = ao_dma_alloc(&ao_spi_dma_in_done[o]);	\
+	} while (0)
+
 void
 ao_spi_init(void)
 {
-	/* Set up the USART pin assignment */
-	PERCFG = (PERCFG & ~SPI_CFG_MASK) | SPI_CFG;
-
 	/* Ensure that SPI USART takes precidence over the other USART
 	 * for pins that they share
 	 */
@@ -248,30 +329,10 @@ ao_spi_init(void)
 	P2SEL = (P2SEL & ~P2SEL_PRI3P1_MASK) | SPI_PRI;
 #endif
 
-	/* Make the SPI pins be controlled by the USART peripheral */
-	SPI_SEL |= SPI_BITS | CSS;
-
-	/* Set up OUT DMA */
-	ao_spi_dma_out_id = ao_dma_alloc(&ao_spi_dma_out_done);
-
-	/* Set up IN DMA */
-	ao_spi_dma_in_id = ao_dma_alloc(&ao_spi_dma_in_done);
-
-	/* Set up the USART.
-	 *
-	 * SPI master/slave mode
-	 */
-	SPI_CSR = (UxCSR_MODE_SPI | UxCSR_RE | UxCSR_DIRECTION);
-
-	/* Set the baud rate and signal parameters
-	 *
-	 * The cc1111 is limited to a 24/8 MHz SPI clock.
-	 * Every peripheral I've ever seen goes faster than that,
-	 * so set the clock to 3MHz (BAUD_E 17, BAUD_M 0)
-	 */
-	SPI_BAUD = 0;
-	SPI_GCR = (UxGCR_CPOL_NEGATIVE |
-		   UxGCR_CPHA_FIRST_EDGE |
-		   UxGCR_ORDER_MSB |
-		   (17 << UxGCR_BAUD_E_SHIFT));
+#if HAS_SPI_0
+	SPI_INIT(0, 0);
+#endif
+#if HAS_SPI_1
+	SPI_INIT(1, MULTI_SPI);
+#endif
 }
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 4b4403a7..7c1acdd1 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -22,7 +22,7 @@
 #if HAS_MS5607 || HAS_MS5611
 
 static __xdata struct ao_ms5607_prom	ms5607_prom;
-static uint8_t	  		ms5607_configured;
+static __xdata uint8_t	  		ms5607_configured;
 
 static void
 ao_ms5607_start(void) {
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index c27f47f1..9ecd076e 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -47,7 +47,9 @@
  */
 
 #define HAS_SPI_0		1
+#define SPI_0_ALT_1		1
 #define HAS_SPI_1		1
+#define SPI_1_ALT_2		1
 #define SPI_CS_PORT		P1
 #define SPI_CS_SEL		P1SEL
 #define SPI_CS_DIR		P1DIR
@@ -55,6 +57,7 @@
 /*
  * Flash
  */
+#define AO_M25_SPI_BUS		1
 #define AO_M25_SPI_CS_PORT	SPI_CS_PORT
 #define AO_M25_SPI_CS_MASK	0x04	/* cs_flash is P1_2 */
 #define M25_MAX_CHIPS		1
@@ -74,6 +77,7 @@
 #define AO_MS5607_MISO_PIN	2
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	0
+#define HAS_EXTI_0		1
 
 /*
  * Igniters
diff --git a/src/telemini-v2.0/ao_telemini.c b/src/telemini-v2.0/ao_telemini.c
index b85ce8c8..6b7545fb 100644
--- a/src/telemini-v2.0/ao_telemini.c
+++ b/src/telemini-v2.0/ao_telemini.c
@@ -17,6 +17,7 @@
 
 #include "ao.h"
 #include "ao_pins.h"
+#include <ao_exti.h>
 
 __xdata uint8_t ao_force_freq;
 
-- 
cgit v1.2.3


From 2380a4b9bd69629c78eec0a87ff8681a0524d8d2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 16:41:33 -0700
Subject: cc1111: Rework ADC configuration a bit, fix Tm V2 ADC usage

The Tm v2 ADC code was not actually fetching and storing the ADC
conversion values.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c         | 35 +++++++++++++++++------------------
 src/telemini-v2.0/ao_pins.h | 11 ++++++++---
 2 files changed, 25 insertions(+), 21 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 6cc08399..1523f94a 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -20,22 +20,22 @@
 volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
 
+#ifdef TELENANO_V_0_1
+# define AO_ADC_FIRST_PIN	1
+#endif
+
+#if HAS_ACCEL_REF
+# define AO_ADC_FIRST_PIN	2
+#endif
+
 #ifndef AO_ADC_FIRST_PIN
-#define AO_ADC_FIRST_PIN	0
+# define AO_ADC_FIRST_PIN	0
 #endif
 
 void
 ao_adc_poll(void)
 {
-#if HAS_ACCEL_REF
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 2;
-#else
-# ifdef TELENANO_V_0_1
-	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | 1;
-# else
 	ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | AO_ADC_FIRST_PIN;
-# endif
-#endif
 }
 
 void
@@ -141,6 +141,7 @@ ao_adc_isr(void) __interrupt 1
 	if (sequence) {
 		/* Start next conversion */
 		ADCCON3 = sequence;
+		return;
 	}
 #endif /* telemini || telenano */
 
@@ -148,8 +149,10 @@ ao_adc_isr(void) __interrupt 1
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.sense[0] + sequence - AO_ADC_FIRST_PIN);
 	a[0] = ADCL;
 	a[1] = ADCH;
-	if (sequence < 5)
+	if (sequence < 5) {
 		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | (sequence + 1);
+		return;
+	}
 #define GOT_ADC
 #endif /* TELEFIRE_V_0_1 */
 
@@ -157,8 +160,6 @@ ao_adc_isr(void) __interrupt 1
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc.batt);
 	a[0] = ADCL;
 	a[1] = ADCH;
-	if (0)
-		;
 #define GOT_ADC
 #endif	
 
@@ -171,12 +172,10 @@ ao_adc_isr(void) __interrupt 1
 #error No known ADC configuration set
 #endif
 
-	else {
-		/* record this conversion series */
-		ao_data_ring[ao_data_head].tick = ao_time();
-		ao_data_head = ao_data_ring_next(ao_data_head);
-		ao_wakeup(DATA_TO_XDATA(&ao_data_head));
-	}
+	/* record this conversion series */
+	ao_data_ring[ao_data_head].tick = ao_time();
+	ao_data_head = ao_data_ring_next(ao_data_head);
+	ao_wakeup(DATA_TO_XDATA(&ao_data_head));
 }
 
 static void
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index 9ecd076e..fac6c535 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -31,7 +31,6 @@
 #define USE_INTERNAL_FLASH	0
 #define HAS_DBG			0
 #define PACKET_HAS_SLAVE	1
-#define USE_FAST_ASCENT_LOG	1
 
 #define AO_LED_GREEN		1
 #define AO_LED_RED		2
@@ -127,6 +126,8 @@ struct ao_adc {
 	printf("tick: %5u apogee: %5d main: %5d batt: %5d\n", \
 	       (p)->tick, (p)->adc.sense_a, (p)->adc.sense_m, (p)->adc.v_batt)
 
+#define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 4))
+
 #define FETCH_ADC() 							\
 	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
 	switch (sequence) {						\
@@ -142,7 +143,11 @@ struct ao_adc {
 		sequence = 1;						\
 		break;							\
 	}								\
-	if (sequence)							\
-		;
+	a[0] = ADCL;							\
+	a[1] = ADCH;							\
+	if (sequence) {							\
+		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
+		return;							\
+	}
 
 #endif /* _AO_PINS_H_ */
-- 
cgit v1.2.3


From af9f9cf0c21630562c74fae41773319229bf44d3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 16:42:45 -0700
Subject: cc1111: Hacky pin interrupt support. Only useful for TeleMini v2

This code is designed to support the MS5607 MISO interrupt bits.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_exti.c | 33 ++++++++++++++++++++++++++++++
 src/cc1111/ao_exti.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 90 insertions(+)
 create mode 100644 src/cc1111/ao_exti.c
 create mode 100644 src/cc1111/ao_exti.h

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_exti.c b/src/cc1111/ao_exti.c
new file mode 100644
index 00000000..537f6252
--- /dev/null
+++ b/src/cc1111/ao_exti.c
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_exti.h>
+
+#if HAS_EXTI_0
+__xdata void 	(*ao_int_callback)(void);
+
+void
+ao_p0_isr(void) __interrupt(13)
+{
+	if (P0IF && (P0IFG & (AO_MS5607_MISO_MASK))) {
+		(*ao_int_callback)();
+	}
+	P0IFG = 0;
+	P0IF = 0;
+}
+#endif
diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
new file mode 100644
index 00000000..00d99a2b
--- /dev/null
+++ b/src/cc1111/ao_exti.h
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_EXTI_H_
+#define _AO_EXTI_H_
+
+#define AO_EXTI_MODE_RISING	1
+#define AO_EXTI_MODE_FALLING	2
+#define AO_EXTI_MODE_PULL_UP	4
+#define AO_EXTI_MODE_PULL_DOWN	8
+#define AO_EXTI_PRIORITY_LOW	16
+#define AO_EXTI_PRIORITY_MED	0
+#define AO_EXTI_PRIORITY_HIGH	32
+
+extern void 	(*ao_int_callback)(void);
+
+#define ao_exti_setup(gpio, pin, mode, callback) do { \
+		ao_int_callback = callback;	      \
+	} while (0)
+
+#define ao_exti_set_mode(gpio, pin, mode) do { \
+	} while (0)
+
+#define ao_exti_set_callback(port, pin, callback) do {	\
+		ao_int_callback = callback;		\
+	} while (0)
+
+#define ao_exti_init() do {			\
+		IEN1 &= IEN1_P0IE;		\
+		PICTL |= PICTL_P0IENL;		\
+	} while (0)
+
+#define ao_exti_enable(port, pin) do {		\
+		P0IFG &= ~(1 << pin);		\
+		P0IF = 0;			\
+		IEN1 |= IEN1_P0IE;		\
+	} while (0)
+
+#define ao_exti_disable(port, pin) do {		\
+		IEN1 &= ~IEN1_P0IE;		\
+	} while (0)
+
+#endif /* _AO_EXTI_H_ */
-- 
cgit v1.2.3


From 8ca98dc8c868c47c372d6b666c36e691fa402824 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:15:55 -0700
Subject: altos: Get telemini to copy current MS5607 state to ring.

The ADC code is responsible for actually inserting the non-ADC data
into the ring, so do the copy there.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c         |  2 +-
 src/telemini-v2.0/ao_pins.h | 48 +++++++++++++++++++++++++--------------------
 2 files changed, 28 insertions(+), 22 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 1523f94a..97a39c4d 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -164,7 +164,7 @@ ao_adc_isr(void) __interrupt 1
 #endif	
 
 #ifdef FETCH_ADC
-	FETCH_ADC()
+	FETCH_ADC();
 #define GOT_ADC
 #endif
 
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index fac6c535..c1a36f8c 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -128,26 +128,32 @@ struct ao_adc {
 
 #define AO_ADC_PINS	((1 << 0) | (1 << 1) | (1 << 4))
 
-#define FETCH_ADC() 							\
-	a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); 	\
-	switch (sequence) {						\
-	case 4:								\
-		a += 4;							\
-		sequence = 0;						\
-		break;							\
-	case 1:								\
-		a += 2;							\
-		sequence = 4;						\
-		break;							\
-	case 0:								\
-		sequence = 1;						\
-		break;							\
-	}								\
-	a[0] = ADCL;							\
-	a[1] = ADCH;							\
-	if (sequence) {							\
-		ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
-		return;							\
-	}
+#define FETCH_ADC() do {						\
+		a = (uint8_t __xdata *) (&ao_data_ring[ao_data_head].adc); \
+		switch (sequence) {					\
+		case 4:							\
+			a += 4;						\
+			sequence = 0;					\
+			break;						\
+		case 1:							\
+			a += 2;						\
+			sequence = 4;					\
+			break;						\
+		case 0:							\
+			sequence = 1;					\
+			break;						\
+		}							\
+		a[0] = ADCL;						\
+		a[1] = ADCH;						\
+		if (sequence) {						\
+			ADCCON3 = ADCCON3_EREF_VDD | ADCCON3_EDIV_512 | sequence; \
+			return;						\
+		}							\
+		AO_DATA_PRESENT(AO_DATA_ADC);				\
+		if (ao_data_present != AO_DATA_ALL)			\
+			return;						\
+		ao_data_ring[ao_data_head].ms5607_raw.pres = ao_ms5607_current.pres; \
+		ao_data_ring[ao_data_head].ms5607_raw.temp = ao_ms5607_current.temp; \
+	} while (0)
 
 #endif /* _AO_PINS_H_ */
-- 
cgit v1.2.3


From 3b2f83a7d686b5fbc0aaa56d48cb734f353631c8 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:16:54 -0700
Subject: altos/cc1111: Leave pin interrupts completely disabled at init time

Don't even turn in the PICTL bits as that seems to cause the chip to
be unhappy.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_exti.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_exti.h b/src/cc1111/ao_exti.h
index 00d99a2b..49fca5d2 100644
--- a/src/cc1111/ao_exti.h
+++ b/src/cc1111/ao_exti.h
@@ -39,19 +39,18 @@ extern void 	(*ao_int_callback)(void);
 		ao_int_callback = callback;		\
 	} while (0)
 
-#define ao_exti_init() do {			\
-		IEN1 &= IEN1_P0IE;		\
-		PICTL |= PICTL_P0IENL;		\
-	} while (0)
+#define ao_exti_init()
 
 #define ao_exti_enable(port, pin) do {		\
 		P0IFG &= ~(1 << pin);		\
 		P0IF = 0;			\
+		PICTL |= PICTL_P0IENL;		\
 		IEN1 |= IEN1_P0IE;		\
 	} while (0)
 
 #define ao_exti_disable(port, pin) do {		\
 		IEN1 &= ~IEN1_P0IE;		\
+		PICTL &= ~PICTL_P0IENL;		\
 	} while (0)
 
 #endif /* _AO_EXTI_H_ */
-- 
cgit v1.2.3


From 4e3955a5b0ac125bd807920c467f959618449fbc Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 17:17:47 -0700
Subject: altos/cc1111: Wake up non-ADC sensor code each timer tick

Make sure the MS5607 code gets told to sample every tick

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_timer.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_timer.c b/src/cc1111/ao_timer.c
index a64b5aba..54af9605 100644
--- a/src/cc1111/ao_timer.c
+++ b/src/cc1111/ao_timer.c
@@ -39,6 +39,9 @@ void ao_timer_isr(void) __interrupt 9
 	if (++ao_adc_count == ao_adc_interval) {
 		ao_adc_count = 0;
 		ao_adc_poll();
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+		ao_wakeup(DATA_TO_XDATA(&ao_adc_count));
+#endif
 	}
 #endif
 }
-- 
cgit v1.2.3


From 7e941695aa27e5eaf453ca1128b8d835472410a4 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 18:43:20 -0700
Subject: altos: Check for MS5607 MISO low before sleeping

If the MISO line goes low before we manage to configure the
interrupts, we'll miss it entirely unless we check the pin explicitly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/attiny/ao_arch_funcs.h  | 2 ++
 src/cc1111/ao_arch_funcs.h  | 1 +
 src/drivers/ao_ms5607.c     | 3 ++-
 src/telemini-v2.0/ao_pins.h | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'src/cc1111')

diff --git a/src/attiny/ao_arch_funcs.h b/src/attiny/ao_arch_funcs.h
index 76dc7820..d4584a9f 100644
--- a/src/attiny/ao_arch_funcs.h
+++ b/src/attiny/ao_arch_funcs.h
@@ -41,6 +41,8 @@
 			PORTB &= ~(1 << bit);	\
 	} while (0)
 
+#define ao_gpio_get(port, bit, pin)	((PORTB >> (bit)) & 1)
+
 /*
  * The SPI mutex must be held to call either of these
  * functions -- this mutex covers the entire SPI operation,
diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index ae184108..ea340dfd 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -145,4 +145,5 @@ ao_spi_init(void);
 
 #define ao_enable_output(port,bit,pin,v) cc1111_enable_output(port,token_evaluator(port,DIR), token_evaluator(port,SEL), pin, bit, v)
 #define ao_gpio_set(port, bit, pin, v) ((pin) = (v))
+#define ao_gpio_get(port, bit, pin) (pin)
 
diff --git a/src/drivers/ao_ms5607.c b/src/drivers/ao_ms5607.c
index 8b2b6333..58ab9197 100644
--- a/src/drivers/ao_ms5607.c
+++ b/src/drivers/ao_ms5607.c
@@ -140,7 +140,8 @@ ao_ms5607_get_sample(uint8_t cmd) {
 	ao_spi_put(AO_MS5607_SPI_INDEX);
 #endif
 	ao_arch_block_interrupts();
-	while (!ao_ms5607_done)
+	while (!ao_gpio_get(AO_MS5607_MISO_PORT, AO_MS5607_MISO_PIN, AO_MS5607_MISO) &&
+	       !ao_ms5607_done)
 		ao_sleep((void *) &ao_ms5607_done);
 	ao_arch_release_interrupts();
 #if AO_MS5607_PRIVATE_PINS
diff --git a/src/telemini-v2.0/ao_pins.h b/src/telemini-v2.0/ao_pins.h
index c1a36f8c..264ad16d 100644
--- a/src/telemini-v2.0/ao_pins.h
+++ b/src/telemini-v2.0/ao_pins.h
@@ -74,6 +74,7 @@
 #define AO_MS5607_CS_MASK	(1 << AO_MS5607_CS_PIN)
 #define AO_MS5607_MISO_PORT	P0
 #define AO_MS5607_MISO_PIN	2
+#define AO_MS5607_MISO		P0_2
 #define AO_MS5607_MISO_MASK	(1 << AO_MS5607_MISO_PIN)
 #define AO_MS5607_SPI_INDEX	0
 #define HAS_EXTI_0		1
-- 
cgit v1.2.3


From a73b02518fcbc9fc0807ed8e141d3a06e8ad8214 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 26 Aug 2013 18:46:02 -0700
Subject: altos: Don't use ao_data on cc1111 projects

cc1111 ao_adc.c supplies the needed globals at this point, and linking
both into the program leads to two different versions of each at
different addresses (yay SDCC linker!)

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_adc.c        | 3 +++
 src/telemini-v2.0/Makefile | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_adc.c b/src/cc1111/ao_adc.c
index 97a39c4d..15429677 100644
--- a/src/cc1111/ao_adc.c
+++ b/src/cc1111/ao_adc.c
@@ -19,6 +19,9 @@
 
 volatile __xdata struct ao_data	ao_data_ring[AO_DATA_RING];
 volatile __data uint8_t		ao_data_head;
+#if (AO_DATA_ALL & ~(AO_DATA_ADC))
+volatile __data uint8_t		ao_data_present;
+#endif
 
 #ifdef TELENANO_V_0_1
 # define AO_ADC_FIRST_PIN	1
diff --git a/src/telemini-v2.0/Makefile b/src/telemini-v2.0/Makefile
index 5550e172..40878778 100644
--- a/src/telemini-v2.0/Makefile
+++ b/src/telemini-v2.0/Makefile
@@ -24,7 +24,8 @@ INC = \
 	ao_product.h \
 	ao_int64.h \
 	ao_sample.h \
-	ao_exti.h
+	ao_exti.h \
+	ao_task.h
 
 CORE_SRC = \
 	ao_cmd.c \
@@ -58,7 +59,6 @@ CC1111_SRC = \
 	ao_spi.c \
 	ao_usb.c \
 	ao_convert_pa.c \
-	ao_data.c \
 	ao_beep.c \
 	ao_timer.c \
 	ao_exti.c \
-- 
cgit v1.2.3