altos: Clean up some minor warnings from -Wall
authorKeith Packard <keithp@keithp.com>
Sat, 21 Dec 2013 06:15:25 +0000 (22:15 -0800)
committerKeith Packard <keithp@keithp.com>
Sat, 21 Dec 2013 06:19:35 +0000 (22:19 -0800)
Unused variables, functions and labels, missing enums in switch.

Signed-off-by: Keith Packard <keithp@keithp.com>
src/core/ao_gps_report_mega.c
src/core/ao_ignite.c
src/core/ao_telemetry.c
src/drivers/ao_cc1120.c
src/drivers/ao_hmc5883.c
src/drivers/ao_mpu6000.c
src/stm/ao_adc_stm.c
src/stm/ao_i2c_stm.c
src/stm/ao_usb_stm.c

index d13885dd8cc5581c01d2a15718a730184289bd29..07a2bc5b0ce7790f0c43ed4bcb88e2897ed761ab 100644 (file)
@@ -24,7 +24,6 @@ ao_gps_report_mega(void)
        static __xdata struct ao_log_mega               gps_log;
        static __xdata struct ao_telemetry_location     gps_data;
        static __xdata struct ao_telemetry_satellite    gps_tracking_data;
-       uint8_t date_reported = 0;
        uint8_t new;
        uint8_t c, n, i;
 
index 9f2ec0a7afc98a972ff020a5ec09df0a80890ac8..823d003c8a0a7574f43859a75de6c2af1ec7c315 100644 (file)
@@ -114,6 +114,8 @@ ao_igniter_fire(enum ao_igniter igniter)
                        ao_delay(AO_IGNITER_FIRE_TIME);
                        AO_IGNITER_SET_MAIN(0);
                        break;
+               default:
+                       break;
                }
                break;
        case AO_IGNITE_MODE_MAIN:
@@ -127,6 +129,8 @@ ao_igniter_fire(enum ao_igniter igniter)
                        ao_delay(AO_IGNITER_FIRE_TIME);
                        AO_IGNITER_SET_MAIN(0);
                        break;
+               default:
+                       break;
                }
                break;
        }
index c118d0077b3485b40577894dda456b0aba901aa6..e529b717e19b0961fe304dce56c2686e963fcf6d 100644 (file)
@@ -473,7 +473,6 @@ ao_telemetry(void)
                        }
                        else
                                time = ao_time();
-               bottom: ;
                }
        }
 }
index 37d04927a0de0d15a1878a0ce8c1d32220cbae72..3429768bc1e3401ad0ea5e3c59d1ecd3d3db86bf 100644 (file)
@@ -152,6 +152,7 @@ ao_radio_strobe(uint8_t addr)
        return in;
 }
 
+#if 0
 static uint8_t
 ao_radio_fifo_read(uint8_t *data, uint8_t len)
 {
@@ -166,6 +167,7 @@ ao_radio_fifo_read(uint8_t *data, uint8_t len)
        ao_radio_deselect();
        return status;
 }
+#endif
 
 static uint8_t
 ao_radio_fifo_write_start(void)
@@ -207,11 +209,13 @@ ao_radio_tx_fifo_space(void)
        return CC1120_FIFO_SIZE - ao_radio_reg_read(CC1120_NUM_TXBYTES);
 }
 
+#if 0
 static uint8_t
 ao_radio_status(void)
 {
        return ao_radio_strobe (CC1120_SNOP);
 }
+#endif
 
 void
 ao_radio_recv_abort(void)
@@ -751,13 +755,11 @@ static uint8_t    tx_data[(AO_RADIO_MAX_SEND + 4) * 2];
 void
 ao_radio_send(const void *d, uint8_t size)
 {
-       uint8_t         marc_status;
        uint8_t         *e = tx_data;
        uint8_t         encode_len;
        uint8_t         this_len;
        uint8_t         started = 0;
        uint8_t         fifo_space;
-       uint8_t         q;
 
        encode_len = ao_fec_encode(d, size, tx_data);
 
@@ -948,11 +950,9 @@ uint8_t
 ao_radio_recv(__xdata void *d, uint8_t size, uint8_t timeout)
 {
        uint8_t         len;
-       uint16_t        i;
        uint8_t         radio_rssi = 0;
        uint8_t         rssi0;
        uint8_t         ret;
-       static int been_here = 0;
 
        size -= 2;                      /* status bytes */
        if (size > AO_RADIO_MAX_RECV) {
@@ -1334,8 +1334,6 @@ static const struct ao_cmds ao_radio_cmds[] = {
 void
 ao_radio_init(void)
 {
-       int     i;
-
        ao_radio_configured = 0;
        ao_spi_init_cs (AO_CC1120_SPI_CS_PORT, (1 << AO_CC1120_SPI_CS_PIN));
 
index 782d03f447e7a79a619b0e79b4814c0fcb4c9ae2..2d217bcf9d392fbd70099beaa3f21eee6ff8f871 100644 (file)
@@ -70,7 +70,6 @@ ao_hmc5883_sample(struct ao_hmc5883_sample *sample)
 {
        uint16_t        *d = (uint16_t *) sample;
        int             i = sizeof (*sample) / 2;
-       uint8_t         single = HMC5883_MODE_SINGLE;
 
        ao_hmc5883_done = 0;
        ao_exti_enable(AO_HMC5883_INT_PORT, AO_HMC5883_INT_PIN);
index f8ce7346c7149d690228c57445607382ce35c05b..0689d7a7f099d299251289d81adc05cae033f048 100644 (file)
@@ -21,7 +21,6 @@
 
 #if HAS_MPU6000
 
-static uint8_t ao_mpu6000_wake;
 static uint8_t ao_mpu6000_configured;
 
 #ifndef AO_MPU6000_I2C_INDEX
index 53f19b406d20a884f6c33b6219b2dc55f10e9b76..505addfac7a64b810660497478be53eaabcdaeb1 100644 (file)
@@ -109,8 +109,10 @@ static void
 ao_adc_dump(void) __reentrant
 {
        struct ao_data  packet;
-       int16_t *d;
+#ifndef AO_ADC_DUMP
        uint8_t i;
+       int16_t *d;
+#endif
 
        ao_data_get(&packet);
 #ifdef AO_ADC_DUMP
index 809b5c6fcf72eac1993e96741f46b60ab955c303..1c90cdb85c19193f223acaf40b970c9cfc74a267 100644 (file)
@@ -185,7 +185,6 @@ uint8_t
 ao_i2c_start(uint8_t index, uint16_t addr)
 {
        struct stm_i2c  *stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-       uint32_t        sr1, sr2;
        int             t;
 
        ao_i2c_state[index] = I2C_IDLE;
@@ -239,10 +238,7 @@ uint8_t
 ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 {
        struct stm_i2c  *stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-       uint8_t         *b = block;
-       uint32_t        sr1;
        uint8_t         tx_dma_index = ao_i2c_stm_info[index].tx_dma_index;
-       int             t;
 
        /* Clear any pending ADDR bit */
        (void) stm_i2c->sr2;
@@ -304,8 +300,6 @@ uint8_t
 ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 {
        struct stm_i2c  *stm_i2c = ao_i2c_stm_info[index].stm_i2c;
-       uint8_t         *b = block;
-       int             t;
        uint8_t         ret = TRUE;
 
        if (len == 0)
index 28a9f9f3e4643beac09b0db8a0dcf6e56c348fc9..27b82357843d3d278b815165b99ecfdc97555f2a 100644 (file)
@@ -119,7 +119,6 @@ static uint8_t      ao_usb_in_pending;
 static uint8_t ao_usb_out_avail;
 static uint8_t ao_usb_running;
 static uint8_t ao_usb_configuration;
-static uint8_t ueienx_0;
 
 #define AO_USB_EP0_GOT_RESET   1
 #define AO_USB_EP0_GOT_SETUP   2
@@ -313,7 +312,6 @@ ao_usb_init_ep(uint8_t ep, uint32_t addr, uint32_t type, uint32_t stat_rx, uint3
 static void
 ao_usb_set_ep0(void)
 {
-       uint32_t                epr;
        int                     e;
 
        ao_usb_sram_addr = 0;
@@ -356,8 +354,6 @@ ao_usb_set_ep0(void)
 static void
 ao_usb_set_configuration(void)
 {
-       uint32_t                epr;
-
        debug ("ao_usb_set_configuration\n");
 
        /* Set up the INT end point */