X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Fao.h;h=84e92f35e77ced7eb5c581c6c43230f9eabc110f;hp=b6862a87597fae90c4c03655b9540f63bb8a413a;hb=251b0971f049cbf2f8db79a32729d47441ce65f3;hpb=69b6f6bb465163cf767bb68e0e4a716d8ad2b39c

diff --git a/src/ao.h b/src/ao.h
index b6862a87..84e92f35 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -63,6 +63,10 @@ ao_sleep(__xdata void *wchan);
 void
 ao_wakeup(__xdata void *wchan);
 
+/* Wake up a specific task */
+void
+ao_wake_task(__xdata struct ao_task *task);
+
 /* Yield the processor to another task */
 void
 ao_yield(void) _naked;
@@ -71,6 +75,10 @@ ao_yield(void) _naked;
 void
 ao_add_task(__xdata struct ao_task * task, void (*start)(void), __code char *name) __reentrant;
 
+/* Terminate the current task */
+void
+ao_exit(void);
+
 /* Dump task info to console */
 void
 ao_task_info(void);
@@ -130,7 +138,7 @@ ao_clock_init(void);
  * ao_adc.c
  */
 
-#define AO_ADC_RING	64
+#define AO_ADC_RING	32
 #define ao_adc_ring_next(n)	(((n) + 1) & (AO_ADC_RING - 1))
 #define ao_adc_ring_prev(n)	(((n) - 1) & (AO_ADC_RING - 1))
 
@@ -341,9 +349,15 @@ ao_cmd_init(void);
  * ao_dma.c
  */
 
-/* Allocate a DMA channel. the 'done' parameter will be set to 1
- * when the dma is finished and will be used to wakeup any waiters
+/* Allocate a DMA channel. the 'done' parameter will be set
+ * when the dma is finished or aborted and will be used to
+ * wakeup any waiters
  */
+
+#define AO_DMA_DONE	1
+#define AO_DMA_ABORTED	2
+#define AO_DMA_TIMEOUT	4
+
 uint8_t
 ao_dma_alloc(__xdata uint8_t * done);
 
@@ -366,7 +380,7 @@ ao_dma_trigger(uint8_t id);
 
 /* Abort a running DMA transfer */
 void
-ao_dma_abort(uint8_t id);
+ao_dma_abort(uint8_t id, uint8_t reason);
 
 /* DMA interrupt routine */
 void
@@ -788,6 +802,23 @@ ao_telemetry_init(void);
  * ao_radio.c
  */
 
+extern __xdata uint8_t	ao_radio_dma;
+extern __xdata uint8_t ao_radio_dma_done;
+extern __xdata uint8_t ao_radio_done;
+extern __xdata uint8_t ao_radio_mutex;
+
+void
+ao_radio_general_isr(void) interrupt 16;
+
+void
+ao_radio_set_telemetry(void);
+
+void
+ao_radio_set_packet(void);
+
+void
+ao_radio_set_rdf(void);
+
 void
 ao_radio_send(__xdata struct ao_telemetry *telemetry) __reentrant;
 
@@ -797,15 +828,21 @@ struct ao_radio_recv {
 	uint8_t			status;
 };
 
-void
+uint8_t
 ao_radio_recv(__xdata struct ao_radio_recv *recv) __reentrant;
 
 void
 ao_radio_rdf(int ms);
 
+void
+ao_radio_abort(uint8_t reason);
+
 void
 ao_radio_rdf_abort(void);
 
+void
+ao_radio_idle(void);
+
 void
 ao_radio_init(void);
 
@@ -935,35 +972,21 @@ struct ao_fifo {
  * Packet-based command interface
  */
 
-#define AO_PACKET_MAX	32
-#define AO_PACKET_WIN	256
-
-#define AO_PACKET_FIN	(1 << 0)
-#define AO_PACKET_SYN	(1 << 1)
-#define AO_PACKET_RST	(1 << 2)
-#define AO_PACKET_ACK	(1 << 3)
+#define AO_PACKET_MAX	8
 
 struct ao_packet {
 	uint8_t		addr;
-	uint8_t		flags;
-	uint16_t	seq;
-	uint16_t	ack;
-	uint16_t	window;
 	uint8_t		len;
+	uint8_t		seq;
+	uint8_t		ack;
 	uint8_t		d[AO_PACKET_MAX];
 };
 
-uint8_t
-ao_packet_connect(uint8_t dest);
-
-uint8_t
-ao_packet_accept(void);
-
-int
-ao_packet_send(uint8_t *data, int len);
-
-int
-ao_packet_recv(uint8_t *data, int len);
+struct ao_packet_recv {
+	struct ao_packet	packet;
+	int8_t			rssi;
+	uint8_t			status;
+};
 
 void
 ao_packet_init(void);