From: Keith Packard <keithp@keithp.com>
Date: Sat, 31 Oct 2009 06:48:36 +0000 (-0700)
Subject: Remove reason from ao_dma_abort
X-Git-Tag: 0.6~14
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=b428faf74ae145126ec1da972028fcfe0b4b2b18

Remove reason from ao_dma_abort
---

diff --git a/src/ao.h b/src/ao.h
index b90befe5..2e2fb589 100644
--- a/src/ao.h
+++ b/src/ao.h
@@ -365,7 +365,6 @@ ao_cmd_init(void);
 
 #define AO_DMA_DONE	1
 #define AO_DMA_ABORTED	2
-#define AO_DMA_TIMEOUT	4
 
 uint8_t
 ao_dma_alloc(__xdata uint8_t * done);
@@ -389,7 +388,7 @@ ao_dma_trigger(uint8_t id);
 
 /* Abort a running DMA transfer */
 void
-ao_dma_abort(uint8_t id, uint8_t reason);
+ao_dma_abort(uint8_t id);
 
 /* DMA interrupt routine */
 void
@@ -844,7 +843,7 @@ void
 ao_radio_rdf(int ms);
 
 void
-ao_radio_abort(uint8_t reason);
+ao_radio_abort(void);
 
 void
 ao_radio_rdf_abort(void);
diff --git a/src/ao_dma.c b/src/ao_dma.c
index 704108e6..110138b5 100644
--- a/src/ao_dma.c
+++ b/src/ao_dma.c
@@ -102,12 +102,12 @@ ao_dma_trigger(uint8_t id)
 }
 
 void
-ao_dma_abort(uint8_t id, uint8_t reason)
+ao_dma_abort(uint8_t id)
 {
 	uint8_t	mask = (1 << id);
 	DMAARM = 0x80 | mask;
 	DMAIRQ &= ~mask;
-	*(ao_dma_done[id]) |= reason;
+	*(ao_dma_done[id]) |= AO_DMA_ABORTED;
 	ao_wakeup(ao_dma_done[id]);
 }
 
diff --git a/src/ao_monitor.c b/src/ao_monitor.c
index 9431f726..d0c1da34 100644
--- a/src/ao_monitor.c
+++ b/src/ao_monitor.c
@@ -75,7 +75,7 @@ ao_set_monitor(uint8_t monitoring)
 {
 	ao_monitoring = monitoring;
 	ao_wakeup(&ao_monitoring);
-	ao_radio_abort(AO_DMA_ABORTED);
+	ao_radio_abort();
 }
 
 static void
diff --git a/src/ao_packet.c b/src/ao_packet.c
index e3133b88..ccd83785 100644
--- a/src/ao_packet.c
+++ b/src/ao_packet.c
@@ -288,7 +288,7 @@ ao_packet_forward(void) __reentrant
 			ao_packet_flush();
 	}
 	ao_packet_enable = 0;
-	ao_radio_abort(AO_DMA_ABORTED);
+	ao_radio_abort();
 	while (ao_packet_echo_task.wchan || ao_packet_task.wchan) {
 		ao_wake_task(&ao_packet_echo_task);
 		ao_wake_task(&ao_packet_task);
diff --git a/src/ao_radio.c b/src/ao_radio.c
index 43899f44..c7c8dc8d 100644
--- a/src/ao_radio.c
+++ b/src/ao_radio.c
@@ -435,9 +435,9 @@ ao_radio_rdf(int ms)
 }
 
 void
-ao_radio_abort(uint8_t reason)
+ao_radio_abort(void)
 {
-	ao_dma_abort(ao_radio_dma, reason);
+	ao_dma_abort(ao_radio_dma);
 	ao_radio_idle();
 }