From: Keith Packard <keithp@keithp.com>
Date: Thu, 29 Mar 2012 04:54:32 +0000 (-0700)
Subject: altos: Move cc1111 DMA engine interface to cc1111/ao_arch.h from ao.h
X-Git-Tag: 1.0.9.5~98
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1f2b75518169c4f2da9762de46bf1d9a71a04d17

altos: Move cc1111 DMA engine interface to cc1111/ao_arch.h from ao.h

It's hardware specific

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

diff --git a/src/cc1111/ao_arch.h b/src/cc1111/ao_arch.h
index 360b35c8..847ac1a6 100644
--- a/src/cc1111/ao_arch.h
+++ b/src/cc1111/ao_arch.h
@@ -258,4 +258,40 @@ struct ao_serial_speed {
 
 extern const __code struct ao_serial_speed ao_serial_speeds[];
 
+/*
+ * ao_dma.c
+ */
+
+/* Allocate a DMA channel. the 'done' parameter will be set when the
+ * dma is finished and will be used to wakeup any waiters
+ */
+
+uint8_t
+ao_dma_alloc(__xdata uint8_t * done);
+
+/* Setup a DMA channel */
+void
+ao_dma_set_transfer(uint8_t id,
+		    void __xdata *srcaddr,
+		    void __xdata *dstaddr,
+		    uint16_t count,
+		    uint8_t cfg0,
+		    uint8_t cfg1);
+
+/* Start a DMA channel */
+void
+ao_dma_start(uint8_t id);
+
+/* Manually trigger a DMA channel */
+void
+ao_dma_trigger(uint8_t id);
+
+/* Abort a running DMA transfer */
+void
+ao_dma_abort(uint8_t id);
+
+/* DMA interrupt routine */
+void
+ao_dma_isr(void) ao_arch_interrupt(8);
+
 #endif /* _AO_ARCH_H_ */
diff --git a/src/core/ao.h b/src/core/ao.h
index c9f17dc0..8263a529 100644
--- a/src/core/ao.h
+++ b/src/core/ao.h
@@ -394,42 +394,6 @@ uint8_t
 ao_cmd_filter(void);
 #endif
 
-/*
- * ao_dma.c
- */
-
-/* Allocate a DMA channel. the 'done' parameter will be set when the
- * dma is finished and will be used to wakeup any waiters
- */
-
-uint8_t
-ao_dma_alloc(__xdata uint8_t * done);
-
-/* Setup a DMA channel */
-void
-ao_dma_set_transfer(uint8_t id,
-		    void __xdata *srcaddr,
-		    void __xdata *dstaddr,
-		    uint16_t count,
-		    uint8_t cfg0,
-		    uint8_t cfg1);
-
-/* Start a DMA channel */
-void
-ao_dma_start(uint8_t id);
-
-/* Manually trigger a DMA channel */
-void
-ao_dma_trigger(uint8_t id);
-
-/* Abort a running DMA transfer */
-void
-ao_dma_abort(uint8_t id);
-
-/* DMA interrupt routine */
-void
-ao_dma_isr(void) ao_arch_interrupt(8);
-
 /*
  * ao_mutex.c
  */