altos: Eliminate 'pin' field from GPIO functions

[fw/altos] / src / drivers / ao_cc1120.c

diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c
index 6b8005852c9bea9ca49ba02b994b0a5717066cf9..b1a1377875c0d17be8c9c65185e89bbdd8b35fbc 100644 (file)
--- a/src/drivers/ao_cc1120.c
+++ b/src/drivers/ao_cc1120.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -182,9 +183,8 @@ ao_radio_fifo_write_start(void)
        return status;
 }
 
-static inline uint8_t ao_radio_fifo_write_stop(uint8_t status) {
+static inline void ao_radio_fifo_write_stop(void) {
        ao_radio_deselect();
-       return status;
 }
 
 static uint8_t
@@ -192,7 +192,8 @@ ao_radio_fifo_write(uint8_t *data, uint8_t len)
 {
        uint8_t status = ao_radio_fifo_write_start();
        ao_radio_spi_send(data, len);
-       return ao_radio_fifo_write_stop(status);
+       ao_radio_fifo_write_stop();
+       return status;
 }
 
 static uint8_t
@@ -200,13 +201,14 @@ ao_radio_fifo_write_fixed(uint8_t data, uint8_t len)
 {
        uint8_t status = ao_radio_fifo_write_start();
        ao_radio_spi_send_fixed(data, len);
-       return ao_radio_fifo_write_stop(status);
+       ao_radio_fifo_write_stop();
+       return status;
 }
 
 static uint8_t
 ao_radio_int_pin(void)
 {
-       return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN, AO_CC1120_INT);
+       return ao_gpio_get(AO_CC1120_INT_PORT, AO_CC1120_INT_PIN);
 }
 
 #if CC1120_DEBUG
@@ -773,11 +775,10 @@ void
 ao_radio_continuity(uint8_t c)
 {
        uint8_t i;
-       uint8_t status;
 
        ao_rdf_start(AO_RADIO_CONT_TOTAL_LEN);
 
-       status = ao_radio_fifo_write_start();
+       (void) ao_radio_fifo_write_start();
        for (i = 0; i < 3; i++) {
                ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
                if (i < c)
@@ -786,8 +787,7 @@ ao_radio_continuity(uint8_t c)
                        ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_TONE_LEN);
        }
        ao_radio_spi_send_fixed(0x00, AO_RADIO_CONT_PAUSE_LEN);
-       status = ao_radio_fifo_write_stop(status);
-       (void) status;
+       ao_radio_fifo_write_stop();
        ao_rdf_run();
 }
 
@@ -805,8 +805,7 @@ ao_radio_test_cmd(void)
        static uint8_t radio_on;
        ao_cmd_white();
        if (ao_cmd_lex_c != '\n') {
-               ao_cmd_decimal();
-               mode = (uint8_t) ao_cmd_lex_u32;
+               mode = ao_cmd_decimal();
        }
        mode++;
        if ((mode & 2) && !radio_on) {
@@ -998,6 +997,8 @@ ao_radio_rx_isr(void)
 {
        uint8_t d;
 
+       if (ao_radio_abort)
+               return;
        if (rx_task_id) {
                if (ao_radio_try_select(rx_task_id)) {
                        ++rx_fast_start;
@@ -1064,7 +1065,7 @@ ao_radio_rx_wait(void)
 }
 
 uint8_t
-ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
+ao_radio_recv(void *d, uint8_t size, uint8_t timeout)
 {
        uint8_t         len;
        uint8_t         radio_rssi = 0;
@@ -1445,7 +1446,9 @@ ao_radio_test_recv(void)
 static void
 ao_radio_aprs(void)
 {
+#if PACKET_HAS_SLAVE
        ao_packet_slave_stop();
+#endif
        ao_aprs_send();
 }
 #endif