From fc9841ee5e92318471b6bec09b7075a788ab8872 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Tue, 28 Aug 2012 18:13:02 -0700
Subject: altos: Mostly working SPI radio link

This includes long delays to avoid overrunning the cc1111 input,
otherwise it works pretty well. The delays mean that we can't capture
the reply to a cmac command though, so more work is needed.

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 src/cc1111/ao_arch_funcs.h |  8 ++++++++
 src/cc1111/ao_spi.c        | 24 ++++++++++++++++++------
 2 files changed, 26 insertions(+), 6 deletions(-)

(limited to 'src/cc1111')

diff --git a/src/cc1111/ao_arch_funcs.h b/src/cc1111/ao_arch_funcs.h
index 5e2fc13d..8f1cc094 100644
--- a/src/cc1111/ao_arch_funcs.h
+++ b/src/cc1111/ao_arch_funcs.h
@@ -77,6 +77,14 @@ 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)
 
+#if AO_SPI_SLAVE
+void
+ao_spi_send_wait(void);
+
+void
+ao_spi_recv_wait(void);
+#endif
+
 void
 ao_spi_init(void);
 
diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index 2b4fd186..39d459f1 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -171,16 +171,20 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 #endif
 	ao_dma_start(ao_spi_dma_out_id);
 	ao_dma_trigger(ao_spi_dma_out_id);
-#if AO_SPI_SLAVE
-	__critical while (!ao_spi_dma_out_done)
-			   ao_sleep(&ao_spi_dma_out_done);
-#else
+#if !AO_SPI_SLAVE
 	__critical while (!ao_spi_dma_in_done)
 		ao_sleep(&ao_spi_dma_in_done);
 #endif
 }
 
-
+#if AO_SPI_SLAVE
+void
+ao_spi_send_wait(void)
+{
+	__critical while (!ao_spi_dma_out_done)
+		ao_sleep(&ao_spi_dma_out_done);
+}
+#endif
 
 /* Receive bytes over SPI.
  *
@@ -221,11 +225,19 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 #if !AO_SPI_SLAVE
 	ao_dma_start(ao_spi_dma_out_id);
 	ao_dma_trigger(ao_spi_dma_out_id);
-#endif
 	__critical while (!ao_spi_dma_in_done)
 		ao_sleep(&ao_spi_dma_in_done);
+#endif
 }
 
+#if AO_SPI_SLAVE
+void
+ao_spi_recv_wait(void)
+{
+	__critical while (!ao_spi_dma_in_done)
+		ao_sleep(&ao_spi_dma_in_done);
+}
+#endif
 
 void
 ao_spi_init(void)
-- 
cgit v1.2.3