X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fcc1111%2Fao_spi.c;h=cdef6bda9d85948bc45ec0fd3f427068c62b4560;hp=e7480fd78e1011c70f5f74db0a96a608c4a57334;hb=583458772746317b98fced907ec780edff465888;hpb=50b58d703b8b48005a3ca9ad4e3603d6f7ac1430

diff --git a/src/cc1111/ao_spi.c b/src/cc1111/ao_spi.c
index e7480fd7..cdef6bda 100644
--- a/src/cc1111/ao_spi.c
+++ b/src/cc1111/ao_spi.c
@@ -143,7 +143,6 @@ static __xdata uint8_t ao_spi_const;
 void
 ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 {
-#if !AO_SPI_SLAVE
 	ao_dma_set_transfer(ao_spi_dma_in_id,
 			    &SPI_BUF,
 			    &ao_spi_const,
@@ -154,7 +153,6 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
-#endif
 	ao_dma_set_transfer(ao_spi_dma_out_id,
 			    block,
 			    &SPI_BUF,
@@ -166,21 +164,23 @@ ao_spi_send_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
 
-#if !AO_SPI_SLAVE
 	ao_dma_start(ao_spi_dma_in_id);
-#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_in_done)
+		ao_sleep(&ao_spi_dma_in_done);
+}
+#endif
 
 /* Receive bytes over SPI.
  *
@@ -204,6 +204,7 @@ 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_spi_const,
 			    &SPI_BUF,
@@ -214,14 +215,25 @@ ao_spi_recv_bus(void __xdata *block, uint16_t len) __reentrant
 			    DMA_CFG1_SRCINC_0 |
 			    DMA_CFG1_DESTINC_0 |
 			    DMA_CFG1_PRIORITY_NORMAL);
+#endif
 
 	ao_dma_start(ao_spi_dma_in_id);
+#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);
+#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)