diff options
| author | Keith Packard <keithp@keithp.com> | 2013-12-20 22:15:25 -0800 | 
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-12-20 22:19:35 -0800 | 
| commit | b31b4622d5bd92c0cc0851818f5b595dbdb60ead (patch) | |
| tree | 7ce882a3f9a583903d2054471769a82e7c3de852 /src | |
| parent | 755082d36231c1b247bc0e1f13919dd9b5c362a8 (diff) | |
altos: Clean up some minor warnings from -Wall
Unused variables, functions and labels, missing enums in switch.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ao_gps_report_mega.c | 1 | ||||
| -rw-r--r-- | src/core/ao_ignite.c | 4 | ||||
| -rw-r--r-- | src/core/ao_telemetry.c | 1 | ||||
| -rw-r--r-- | src/drivers/ao_cc1120.c | 10 | ||||
| -rw-r--r-- | src/drivers/ao_hmc5883.c | 1 | ||||
| -rw-r--r-- | src/drivers/ao_mpu6000.c | 1 | ||||
| -rw-r--r-- | src/stm/ao_adc_stm.c | 4 | ||||
| -rw-r--r-- | src/stm/ao_i2c_stm.c | 6 | ||||
| -rw-r--r-- | src/stm/ao_usb_stm.c | 4 | 
9 files changed, 11 insertions, 21 deletions
| diff --git a/src/core/ao_gps_report_mega.c b/src/core/ao_gps_report_mega.c index d13885dd..07a2bc5b 100644 --- a/src/core/ao_gps_report_mega.c +++ b/src/core/ao_gps_report_mega.c @@ -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; diff --git a/src/core/ao_ignite.c b/src/core/ao_ignite.c index 9f2ec0a7..823d003c 100644 --- a/src/core/ao_ignite.c +++ b/src/core/ao_ignite.c @@ -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;  	} diff --git a/src/core/ao_telemetry.c b/src/core/ao_telemetry.c index c118d007..e529b717 100644 --- a/src/core/ao_telemetry.c +++ b/src/core/ao_telemetry.c @@ -473,7 +473,6 @@ ao_telemetry(void)  			}  			else  				time = ao_time(); -		bottom:	;  		}  	}  } diff --git a/src/drivers/ao_cc1120.c b/src/drivers/ao_cc1120.c index 37d04927..3429768b 100644 --- a/src/drivers/ao_cc1120.c +++ b/src/drivers/ao_cc1120.c @@ -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)); diff --git a/src/drivers/ao_hmc5883.c b/src/drivers/ao_hmc5883.c index 782d03f4..2d217bcf 100644 --- a/src/drivers/ao_hmc5883.c +++ b/src/drivers/ao_hmc5883.c @@ -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); diff --git a/src/drivers/ao_mpu6000.c b/src/drivers/ao_mpu6000.c index f8ce7346..0689d7a7 100644 --- a/src/drivers/ao_mpu6000.c +++ b/src/drivers/ao_mpu6000.c @@ -21,7 +21,6 @@  #if HAS_MPU6000 -static uint8_t	ao_mpu6000_wake;  static uint8_t	ao_mpu6000_configured;  #ifndef AO_MPU6000_I2C_INDEX diff --git a/src/stm/ao_adc_stm.c b/src/stm/ao_adc_stm.c index 53f19b40..505addfa 100644 --- a/src/stm/ao_adc_stm.c +++ b/src/stm/ao_adc_stm.c @@ -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 diff --git a/src/stm/ao_i2c_stm.c b/src/stm/ao_i2c_stm.c index 809b5c6f..1c90cdb8 100644 --- a/src/stm/ao_i2c_stm.c +++ b/src/stm/ao_i2c_stm.c @@ -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) diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c index 28a9f9f3..27b82357 100644 --- a/src/stm/ao_usb_stm.c +++ b/src/stm/ao_usb_stm.c @@ -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 */ | 
