Remove reason from ao_dma_abort

diff --git a/src/ao.h b/src/ao.h
index b90befe56e8921cc986176bce114bb104f5661bb..2e2fb589f1916dd20304c3a2cfe82ade5092ed4f 100644 (file)
--- 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 704108e65dcabe90f4b00846dd4b927704cafbd2..110138b56a42d5cfd50f19c3b3df673bff32d1da 100644 (file)
--- 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 9431f726dc99176d2dff3231b7963f2f3bfcc18b..d0c1da34914ef543bcbb5c9f5176e62ec6337316 100644 (file)
--- 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 e3133b888d919a492a64b61c4af3126a42cd736d..ccd83785daaf3d3e15364aebd441b443415b4058 100644 (file)
--- 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 43899f442ccac6ad197613a23ed0a79b918159f1..c7c8dc8d7620bc69883bac47d76b4e004adba569 100644 (file)
--- 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();
 }