From: Keith Packard <keithp@keithp.com>
Date: Tue, 5 Feb 2019 06:24:37 +0000 (-0800)
Subject: altos: Mark local functions 'static'
X-Git-Tag: 1.9.1~1^2~140
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=c11427819ca24bb77523496309b5b6f699d126c5

altos: Mark local functions 'static'

Working towards supporting -Wmissing-prototypes

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/drivers/ao_btm.c b/src/drivers/ao_btm.c
index 04bf4138..71599fbd 100644
--- a/src/drivers/ao_btm.c
+++ b/src/drivers/ao_btm.c
@@ -187,7 +187,7 @@ ao_btm_getchar(void)
  * it after a few characters.
  */
 
-uint8_t
+static uint8_t
 ao_btm_get_line(void)
 {
 	uint8_t ao_btm_reply_len = 0;
@@ -209,8 +209,8 @@ ao_btm_get_line(void)
 /*
  * Drain the serial port completely
  */
-void
-ao_btm_drain()
+static void
+ao_btm_drain(void)
 {
 	while (ao_btm_get_line())
 		;
@@ -219,7 +219,7 @@ ao_btm_drain()
 /*
  * Set the stdio echo for the bluetooth link
  */
-void
+static void
 ao_btm_echo(uint8_t echo)
 {
 	ao_stdios[ao_btm_stdio].echo = echo;
@@ -230,7 +230,7 @@ ao_btm_echo(uint8_t echo)
  * can't keep up with 57600 baud
  */
 
-void
+static void
 ao_btm_putchar(char c)
 {
 	ao_btm_log_out_char(c);
@@ -242,7 +242,7 @@ ao_btm_putchar(char c)
  * Wait for the bluetooth device to return
  * status from the previously executed command
  */
-uint8_t
+static uint8_t
 ao_btm_wait_reply(void)
 {
 	for (;;) {
@@ -256,7 +256,7 @@ ao_btm_wait_reply(void)
 	}
 }
 
-void
+static void
 ao_btm_string(const char *cmd)
 {
 	char	c;
@@ -265,7 +265,7 @@ ao_btm_string(const char *cmd)
 		ao_btm_putchar(c);
 }
 
-uint8_t
+static uint8_t
 ao_btm_cmd(const char *cmd)
 {
 	ao_btm_drain();
@@ -282,7 +282,7 @@ ao_btm_cmd(const char *cmd)
 	return ao_btm_wait_reply();
 }
 
-uint8_t
+static uint8_t
 ao_btm_set_name(void)
 {
 	char	sn[8];
@@ -301,7 +301,7 @@ ao_btm_set_name(void)
 	return ao_btm_wait_reply();
 }
 
-uint8_t
+static uint8_t
 ao_btm_try_speed(uint8_t speed)
 {
 	ao_serial_btm_set_speed(speed);
@@ -329,8 +329,8 @@ ao_btm_try_speed(uint8_t speed)
 #define BT_CC1111	1
 #endif
 
-void
-ao_btm_check_link()
+static void
+ao_btm_check_link(void)
 {
 #if BT_CC1111
 	ao_arch_critical(
@@ -362,7 +362,7 @@ struct ao_task ao_btm_task;
  * A thread to initialize the bluetooth device and
  * hang around to blink the LED when connected
  */
-void
+static void
 ao_btm(void)
 {
 #ifdef AO_BTM_INT_PORT
diff --git a/src/drivers/ao_cc115l.c b/src/drivers/ao_cc115l.c
index a8f2c4f5..2b5fd3fd 100644
--- a/src/drivers/ao_cc115l.c
+++ b/src/drivers/ao_cc115l.c
@@ -596,7 +596,7 @@ uint8_t ao_radio_tone_count;
 uint8_t ao_radio_tone_current;
 uint8_t ao_radio_tone_offset;
 
-int16_t
+static int16_t
 ao_radio_tone_fill(uint8_t *buf, int16_t len)
 {
 	int16_t	ret = 0;
diff --git a/src/drivers/ao_companion.c b/src/drivers/ao_companion.c
index 44868fb6..d6fbb6b7 100644
--- a/src/drivers/ao_companion.c
+++ b/src/drivers/ao_companion.c
@@ -93,7 +93,7 @@ ao_companion_notify(void)
 	COMPANION_DESELECT();
 }
 
-void
+static void
 ao_companion(void)
 {
 	uint8_t	i;
@@ -113,7 +113,7 @@ ao_companion(void)
 	ao_exit();
 }
 
-void
+static void
 ao_companion_status(void) 
 {
 	uint8_t	i;
diff --git a/src/drivers/ao_gps_skytraq.c b/src/drivers/ao_gps_skytraq.c
index 193f20dc..f767118a 100644
--- a/src/drivers/ao_gps_skytraq.c
+++ b/src/drivers/ao_gps_skytraq.c
@@ -88,7 +88,7 @@ ao_gps_lexchar(void)
 	ao_gps_char = c;
 }
 
-void
+static void
 ao_gps_skip_field(void)
 {
 	for (;;) {
@@ -99,7 +99,7 @@ ao_gps_skip_field(void)
 	}
 }
 
-void
+static void
 ao_gps_skip_sep(void)
 {
 	char c = ao_gps_char;
diff --git a/src/drivers/ao_hmc5883.c b/src/drivers/ao_hmc5883.c
index f4705708..55a193ac 100644
--- a/src/drivers/ao_hmc5883.c
+++ b/src/drivers/ao_hmc5883.c
@@ -66,7 +66,7 @@ ao_hmc5883_isr(void)
 
 static uint32_t	ao_hmc5883_missed_irq;
 
-void
+static void
 ao_hmc5883_sample(struct ao_hmc5883_sample *sample)
 {
 	uint16_t	*d = (uint16_t *) sample;
diff --git a/src/drivers/ao_lco.c b/src/drivers/ao_lco.c
index 5f5db572..b314ef7c 100644
--- a/src/drivers/ao_lco.c
+++ b/src/drivers/ao_lco.c
@@ -269,7 +269,7 @@ ao_lco_input(void)
  * visually inspect the system for correct operation
  */
 static void
-ao_lco_display_test()
+ao_lco_display_test(void)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
 	ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
@@ -316,7 +316,7 @@ ao_lco_main(void)
 }
 
 #if DEBUG
-void
+static void
 ao_lco_set_debug(void)
 {
 	uint16_t r  = ao_cmd_decimal();
diff --git a/src/drivers/ao_lco_two.c b/src/drivers/ao_lco_two.c
index 49ea1236..cfef2a63 100644
--- a/src/drivers/ao_lco_two.c
+++ b/src/drivers/ao_lco_two.c
@@ -121,7 +121,7 @@ ao_lco_main(void)
 }
 
 #if DEBUG
-void
+static void
 ao_lco_set_debug(void)
 {
 	uint16_t r = ao_cmd_decimal();
diff --git a/src/drivers/ao_packet_master.c b/src/drivers/ao_packet_master.c
index 68a5efef..e67dd27f 100644
--- a/src/drivers/ao_packet_master.c
+++ b/src/drivers/ao_packet_master.c
@@ -83,7 +83,7 @@ ao_packet_master_check_busy(void)
 		ao_packet_master_delay = AO_PACKET_MASTER_DELAY_LONG;
 }
 
-void
+static void
 ao_packet_master(void)
 {
 	ao_config_get();
diff --git a/src/drivers/ao_packet_slave.c b/src/drivers/ao_packet_slave.c
index 3ae1138c..a5834799 100644
--- a/src/drivers/ao_packet_slave.c
+++ b/src/drivers/ao_packet_slave.c
@@ -18,7 +18,7 @@
 
 #include "ao.h"
 
-void
+static void
 ao_packet_slave(void)
 {
 	ao_tx_packet.addr = ao_serial_number;
diff --git a/src/drivers/ao_pad.c b/src/drivers/ao_pad.c
index 85691f5c..eeb9b505 100644
--- a/src/drivers/ao_pad.c
+++ b/src/drivers/ao_pad.c
@@ -176,7 +176,7 @@ ao_pad_run(void)
  *	AO_PAD_R_IGNITER_SENSE_GND	Resistors from igniter sense ADC inputs to ground
  */
 
-int16_t
+static int16_t
 ao_pad_decivolt(int16_t adc, int16_t r_plus, int16_t r_minus)
 {
 	int32_t	mul = (int32_t) AO_ADC_REFERENCE_DV * (r_plus + r_minus);
@@ -472,7 +472,7 @@ ao_pad(void)
 	}
 }
 
-void
+static void
 ao_pad_test(void)
 {
 	uint8_t	c;
@@ -501,7 +501,7 @@ ao_pad_test(void)
 	}
 }
 
-void
+static void
 ao_pad_manual(void)
 {
 	uint8_t	ignite;
@@ -529,7 +529,7 @@ static struct ao_task ao_pad_ignite_task;
 static struct ao_task ao_pad_monitor_task;
 
 #if DEBUG
-void
+static void
 ao_pad_set_debug(void)
 {
 	uint16_t r = ao_cmd_decimal();
diff --git a/src/drivers/ao_rn4678.c b/src/drivers/ao_rn4678.c
index 4ace4b78..4d13decc 100644
--- a/src/drivers/ao_rn4678.c
+++ b/src/drivers/ao_rn4678.c
@@ -116,7 +116,7 @@ static AO_TICK_TYPE	ao_rn_buf_time;
  * disabled due to a firmware bug. So, this code finds those in the
  * input and strips them out.
  */
-int
+static int
 _ao_wrap_rn_pollchar(void)
 {
 	int		c = AO_READ_AGAIN;
@@ -368,7 +368,7 @@ static uint8_t	ao_rn_stdio;
 /*
  * Set the stdio echo for the bluetooth link
  */
-void
+static void
 ao_rn_echo(uint8_t echo)
 {
 	ao_stdios[ao_rn_stdio].echo = echo;
diff --git a/src/kernel/ao_config.c b/src/kernel/ao_config.c
index 596a0410..fb7d333b 100644
--- a/src/kernel/ao_config.c
+++ b/src/kernel/ao_config.c
@@ -276,13 +276,15 @@ ao_config_get(void)
 	ao_mutex_put(&ao_config_mutex);
 }
 
-void
+#if HAS_RADIO
+
+static void
 ao_config_callsign_show(void)
 {
 	printf ("Callsign: \"%s\"\n", ao_config.callsign);
 }
 
-void
+static void
 ao_config_callsign_set(void) 
 {
 	uint8_t	c;
@@ -306,16 +308,14 @@ ao_config_callsign_set(void)
 	_ao_config_edit_finish();
 }
 
-#if HAS_RADIO
-
-void
+static void
 ao_config_frequency_show(void) 
 {
 	printf("Frequency: %ld\n",
 	       ao_config.frequency);
 }
 
-void
+static void
 ao_config_frequency_set(void) 
 {
 	uint32_t r = ao_cmd_decimal();
@@ -359,14 +359,14 @@ ao_config_send_frequency_set(void)
 
 #if HAS_FLIGHT
 
-void
+static void
 ao_config_main_deploy_show(void) 
 {
 	printf("Main deploy: %d meters\n",
 	       ao_config.main_deploy);
 }
 
-void
+static void
 ao_config_main_deploy_set(void) 
 {
 	uint32_t r = ao_cmd_decimal();
@@ -378,7 +378,7 @@ ao_config_main_deploy_set(void)
 }
 
 #if HAS_ACCEL
-void
+static void
 ao_config_accel_calibrate_show(void) 
 {
 	printf("Accel cal +1g: %d -1g: %d\n",
@@ -441,7 +441,7 @@ ao_config_accel_calibrate_auto(char *orientation)
 	return accel_total >> ACCEL_CALIBRATE_SHIFT;
 }
 
-void
+static void
 ao_config_accel_calibrate_set(void) 
 {
 	int16_t	up, down;
@@ -494,14 +494,14 @@ ao_config_accel_calibrate_set(void)
 }
 #endif /* HAS_ACCEL */
 
-void
+static void
 ao_config_apogee_delay_show(void) 
 {
 	printf("Apogee delay: %d seconds\n",
 	       ao_config.apogee_delay);
 }
 
-void
+static void
 ao_config_apogee_delay_set(void) 
 {
 	uint32_t r = ao_cmd_decimal();
@@ -512,14 +512,14 @@ ao_config_apogee_delay_set(void)
 	_ao_config_edit_finish();
 }
 
-void
+static void
 ao_config_apogee_lockout_show(void) 
 {
 	printf ("Apogee lockout: %d seconds\n",
 		ao_config.apogee_lockout);
 }
 
-void
+static void
 ao_config_apogee_lockout_set(void) 
 {
 	uint16_t r = ao_cmd_decimal();
@@ -533,13 +533,13 @@ ao_config_apogee_lockout_set(void)
 #endif /* HAS_FLIGHT */
 
 #if HAS_RADIO
-void
+static void
 ao_config_radio_cal_show(void) 
 {
 	printf("Radio cal: %ld\n", ao_config.radio_cal);
 }
 
-void
+static void
 ao_config_radio_cal_set(void) 
 {
 	uint32_t r = ao_cmd_decimal();
@@ -558,13 +558,13 @@ ao_config_radio_cal_set(void)
 #error Please define HAS_TELEMETRY
 #endif
 
-void
+static void
 ao_config_radio_rate_show(void) 
 {
 	printf("Telemetry rate: %d\n", ao_config.radio_rate);
 }
 
-void
+static void
 ao_config_radio_rate_set(void) 
 {
 	uint16_t r = ao_cmd_decimal();
@@ -588,7 +588,7 @@ ao_config_radio_rate_set(void)
 
 #if HAS_LOG
 
-void
+static void
 ao_config_log_show(void) 
 {
 	printf("Max flight log: %d kB\n", (int16_t) (ao_config.flight_log_max >> 10));
@@ -611,7 +611,7 @@ ao_config_log_fix_append(void)
 }
 #endif
 
-void
+static void
 ao_config_log_set(void) 
 {
 #if FLIGHT_LOG_APPEND
@@ -640,13 +640,13 @@ ao_config_log_set(void)
 #endif /* HAS_LOG */
 
 #if HAS_IGNITE
-void
+static void
 ao_config_ignite_mode_show(void) 
 {
 	printf("Ignite mode: %d\n", ao_config.ignite_mode);
 }
 
-void
+static void
 ao_config_ignite_mode_set(void) 
 {
 	uint16_t r = ao_cmd_decimal();
@@ -659,7 +659,7 @@ ao_config_ignite_mode_set(void)
 #endif
 
 #if HAS_ACCEL
-void
+static void
 ao_config_pad_orientation_show(void) 
 {
 	printf("Pad orientation: %d\n", ao_config.pad_orientation);
@@ -669,7 +669,7 @@ ao_config_pad_orientation_show(void)
 #define AO_ACCEL_INVERT	0x7fff
 #endif
 
-void
+static void
 ao_config_pad_orientation_set(void) 
 {
 	uint16_t r = ao_cmd_decimal() & 1;
@@ -688,13 +688,13 @@ ao_config_pad_orientation_set(void)
 #endif
 
 #if HAS_RADIO
-void
+static void
 ao_config_radio_enable_show(void) 
 {
 	printf("Radio enable: %d\n", ao_config.radio_enable);
 }
 
-void
+static void
 ao_config_radio_enable_set(void) 
 {
 	uint16_t r = ao_cmd_decimal();
@@ -713,7 +713,7 @@ ao_config_radio_enable_set(void)
 
 uint8_t	ao_config_aes_seq = 1;
 
-void
+static void
 ao_config_key_show(void) 
 {
 	uint8_t	i;
@@ -723,7 +723,7 @@ ao_config_key_show(void)
 	printf("\n");
 }
 
-void
+static void
 ao_config_key_set(void) 
 {
 	uint8_t i;
@@ -742,13 +742,13 @@ ao_config_key_set(void)
 
 #if HAS_APRS
 
-void
+static void
 ao_config_aprs_show(void)
 {
 	printf ("APRS interval: %d\n", ao_config.aprs_interval);
 }
 
-void
+static void
 ao_config_aprs_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -805,13 +805,13 @@ ao_config_radio_power_set(void)
 #endif
 
 #if HAS_BEEP_CONFIG
-void
+static void
 ao_config_beep_show(void)
 {
 	printf ("Beeper setting: %d\n", ao_config.mid_beep);
 }
 
-void
+static void
 ao_config_beep_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -824,7 +824,7 @@ ao_config_beep_set(void)
 #endif
 
 #if HAS_TRACKER
-void
+static void
 ao_config_tracker_show(void)
 {
 	printf ("Tracker setting: %d %d\n",
@@ -832,7 +832,7 @@ ao_config_tracker_show(void)
 		ao_config.tracker_interval);
 }
 
-void
+static void
 ao_config_tracker_set(void)
 {
 	uint16_t	m, i;
@@ -853,13 +853,13 @@ ao_config_tracker_set(void)
 #endif /* HAS_TRACKER */
 
 #if AO_PYRO_NUM
-void
+static void
 ao_config_pyro_time_show(void)
 {
 	printf ("Pyro time: %d\n", ao_config.pyro_time);
 }
 
-void
+static void
 ao_config_pyro_time_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -872,14 +872,14 @@ ao_config_pyro_time_set(void)
 #endif
 
 #if HAS_APRS
-void
+static void
 ao_config_aprs_ssid_show(void)
 {
 	printf ("APRS SSID: %d\n",
 		ao_config.aprs_ssid);
 }
 
-void
+static void
 ao_config_aprs_ssid_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -894,7 +894,7 @@ ao_config_aprs_ssid_set(void)
 	_ao_config_edit_finish();
 }
 
-void
+static void
 ao_config_aprs_format_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -905,7 +905,7 @@ ao_config_aprs_format_set(void)
 	_ao_config_edit_finish();
 }
 
-void
+static void
 ao_config_aprs_format_show(void)
 {
 	printf ("APRS format: %d\n", ao_config.aprs_format);
@@ -913,13 +913,13 @@ ao_config_aprs_format_show(void)
 #endif /* HAS_APRS */
 
 #if HAS_FIXED_PAD_BOX
-void
+static void
 ao_config_pad_box_show(void)
 {
 	printf ("Pad box: %d\n", ao_config.pad_box);
 }
 
-void
+static void
 ao_config_pad_box_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -930,13 +930,13 @@ ao_config_pad_box_set(void)
 	_ao_config_edit_finish();
 }
 
-void
+static void
 ao_config_pad_idle_show(void)
 {
 	printf ("Idle timeout: %d\n", ao_config.pad_idle);
 }
 
-void
+static void
 ao_config_pad_idle_set(void)
 {
 	uint16_t r = ao_cmd_decimal();
@@ -1059,7 +1059,7 @@ const struct ao_config_var ao_config_vars[] = {
 	{ 0, 0, 0 }
 };
 
-void
+static void
 ao_config_set(void)
 {
 	char	c;
diff --git a/src/kernel/ao_gps_report_metrum.c b/src/kernel/ao_gps_report_metrum.c
index 06863fe4..e5839b36 100644
--- a/src/kernel/ao_gps_report_metrum.c
+++ b/src/kernel/ao_gps_report_metrum.c
@@ -19,7 +19,7 @@
 #include "ao.h"
 #include "ao_log.h"
 
-void
+static void
 ao_gps_report_metrum(void)
 {
 	static struct ao_log_metrum		gps_log;
diff --git a/src/kernel/ao_ignite.c b/src/kernel/ao_ignite.c
index a6ff9979..e9d04dcc 100644
--- a/src/kernel/ao_ignite.c
+++ b/src/kernel/ao_ignite.c
@@ -83,7 +83,7 @@ ao_igniter_status(enum ao_igniter igniter)
 #define AO_IGNITER_CHARGE_TIME		AO_MS_TO_TICKS(2000)
 #endif
 
-void
+static void
 ao_igniter_fire(enum ao_igniter igniter)
 {
 	ao_ignition[igniter].firing = 1;
@@ -136,7 +136,7 @@ ao_igniter_fire(enum ao_igniter igniter)
 	ao_ignition[igniter].firing = 0;
 }
 
-void
+static void
 ao_igniter(void)
 {
 	enum ao_igniter igniter;
@@ -159,7 +159,7 @@ ao_igniter(void)
 
 #endif
 
-void
+static void
 ao_ignite_manual(void)
 {
 	ao_cmd_white();
@@ -190,7 +190,7 @@ const char * const ao_igniter_status_names[] = {
 };
 
 #if HAS_IGNITE
-void
+static void
 ao_ignite_print_status(enum ao_igniter igniter, const char *name) 
 {
 	enum ao_igniter_status status = ao_igniter_status(igniter);
@@ -200,7 +200,7 @@ ao_ignite_print_status(enum ao_igniter igniter, const char *name)
 }
 #endif
 
-void
+static void
 ao_ignite_test(void)
 {
 #if HAS_IGNITE
diff --git a/src/kernel/ao_log.c b/src/kernel/ao_log.c
index fac211cf..c0a42b29 100644
--- a/src/kernel/ao_log.c
+++ b/src/kernel/ao_log.c
@@ -191,7 +191,7 @@ ao_log_flight(uint8_t slot)
 #endif
 
 static uint8_t
-ao_log_slots()
+ao_log_slots(void)
 {
 	return (uint8_t) (ao_storage_log_max / ao_config.flight_log_max);
 }
@@ -405,7 +405,7 @@ ao_log_full(void)
 static struct ao_task ao_log_task;
 #endif
 
-void
+static void
 ao_log_list(void) 
 {
 	uint8_t	slot;
@@ -425,7 +425,7 @@ ao_log_list(void)
 	printf ("done\n");
 }
 
-void
+static void
 ao_log_delete(void) 
 {
 	uint8_t slot;
diff --git a/src/kernel/ao_monitor.c b/src/kernel/ao_monitor.c
index 3f1ff217..400ae4df 100644
--- a/src/kernel/ao_monitor.c
+++ b/src/kernel/ao_monitor.c
@@ -62,7 +62,7 @@ _ao_monitor_adjust(void)
 	ao_wakeup(&ao_monitoring);
 }
 
-void
+static void
 ao_monitor_get(void)
 {
 	uint8_t	size;
@@ -93,7 +93,7 @@ ao_monitor_get(void)
 #if AO_MONITOR_LED
 struct ao_task ao_monitor_blink_task;
 
-void
+static void
 ao_monitor_blink(void)
 {
 #ifdef AO_MONITOR_BAD
@@ -121,7 +121,7 @@ static const char xdigit[16] = {
 
 #define hex(c) do { putchar(xdigit[(c) >> 4]); putchar(xdigit[(c)&0xf]); } while (0)
 
-void
+static void
 ao_monitor_put(void)
 {
 #if LEGACY_MONITOR
diff --git a/src/kernel/ao_report.c b/src/kernel/ao_report.c
index 08967af8..872dcd48 100644
--- a/src/kernel/ao_report.c
+++ b/src/kernel/ao_report.c
@@ -251,7 +251,7 @@ ao_report_continuity(void)
 }
 #endif
 
-void
+static void
 ao_report(void)
 {
 	for(;;) {
diff --git a/src/kernel/ao_storage.c b/src/kernel/ao_storage.c
index 890bdcae..132431e2 100644
--- a/src/kernel/ao_storage.c
+++ b/src/kernel/ao_storage.c
@@ -143,7 +143,7 @@ ao_storage_store(void)
 }
 #endif
 
-void
+static void
 ao_storage_zap(void) 
 {
 	uint32_t v = ao_cmd_hex();
@@ -152,7 +152,7 @@ ao_storage_zap(void)
 	ao_storage_erase((uint32_t) v << 8);
 }
 
-void
+static void
 ao_storage_zapall(void) 
 {
 	uint32_t	pos;
@@ -312,7 +312,7 @@ ao_storage_test(void)
 }
 #endif /* AO_STORAGE_TEST */
 
-void
+static void
 ao_storage_info(void) 
 {
 	ao_storage_setup();
diff --git a/src/kernel/ao_telemetry.c b/src/kernel/ao_telemetry.c
index 9e1304f7..ae33173f 100644
--- a/src/kernel/ao_telemetry.c
+++ b/src/kernel/ao_telemetry.c
@@ -409,7 +409,7 @@ ao_send_companion(void)
 }
 #endif
 
-void
+static void
 ao_telemetry(void)
 {
 	uint16_t	time;
diff --git a/src/lpc/ao_interrupt.c b/src/lpc/ao_interrupt.c
index 8d71f43f..77be7fab 100644
--- a/src/lpc/ao_interrupt.c
+++ b/src/lpc/ao_interrupt.c
@@ -40,12 +40,12 @@ extern char __interrupt_rom__, __interrupt_start__, __interrupt_end__;
 
 /* Interrupt functions */
 
-void lpc_halt_isr(void)
+static void lpc_halt_isr(void)
 {
 	ao_panic(AO_PANIC_CRASH);
 }
 
-void lpc_ignore_isr(void)
+static void lpc_ignore_isr(void)
 {
 }
 
diff --git a/src/lpc/ao_usb_lpc.c b/src/lpc/ao_usb_lpc.c
index 594114b6..d6763c29 100644
--- a/src/lpc/ao_usb_lpc.c
+++ b/src/lpc/ao_usb_lpc.c
@@ -131,7 +131,7 @@ static inline uint32_t set_toggle(uint32_t 	current_value,
  * Set current device address and mark the
  * interface as active
  */
-void
+static void
 ao_usb_set_address(uint8_t address)
 {
 	debug("ao_usb_set_address %02x\n", address);
@@ -813,7 +813,7 @@ _ao_usb_out_recv(void)
 	ao_usb_set_epn_out(AO_USB_OUT_EP, ao_usb_out_rx_buffer[1-ao_usb_out_rx_cur], AO_USB_OUT_SIZE);
 }
 
-int
+static int
 _ao_usb_pollchar(void)
 {
 	uint8_t c;
diff --git a/src/stm/ao_i2c_stm.c b/src/stm/ao_i2c_stm.c
index c02bc5a5..8f549318 100644
--- a/src/stm/ao_i2c_stm.c
+++ b/src/stm/ao_i2c_stm.c
@@ -278,7 +278,7 @@ ao_i2c_send(void *block, uint16_t len, uint8_t index, uint8_t stop)
 	return true;
 }
 
-void
+static void
 ao_i2c_recv_dma_isr(int index)
 {
 	int		i;
@@ -374,7 +374,7 @@ ao_i2c_recv(void *block, uint16_t len, uint8_t index, uint8_t stop)
 	return ret;
 }
 
-void
+static void
 ao_i2c_channel_init(uint8_t index)
 {
 	struct stm_i2c	*stm_i2c = ao_i2c_stm_info[index].stm_i2c;
diff --git a/src/stm/ao_interrupt.c b/src/stm/ao_interrupt.c
index d8be3667..a98d799a 100644
--- a/src/stm/ao_interrupt.c
+++ b/src/stm/ao_interrupt.c
@@ -29,12 +29,12 @@ extern char __bss_start__, __bss_end__;
 
 /* Interrupt functions */
 
-void stm_halt_isr(void)
+static void stm_halt_isr(void)
 {
 	ao_panic(AO_PANIC_CRASH);
 }
 
-void stm_ignore_isr(void)
+static void stm_ignore_isr(void)
 {
 }
 
diff --git a/src/stm/ao_serial_stm.c b/src/stm/ao_serial_stm.c
index c1a2f1bd..7a552e5d 100644
--- a/src/stm/ao_serial_stm.c
+++ b/src/stm/ao_serial_stm.c
@@ -339,7 +339,7 @@ ao_serial2_set_speed(uint8_t speed)
 }
 
 #if HAS_SERIAL_SW_FLOW
-void
+static void
 ao_serial2_cts(void)
 {
 	_ao_usart_cts(&ao_stm_usart2);
diff --git a/src/stm/ao_usb_stm.c b/src/stm/ao_usb_stm.c
index d7cbd5b7..7f81e20e 100644
--- a/src/stm/ao_usb_stm.c
+++ b/src/stm/ao_usb_stm.c
@@ -829,7 +829,7 @@ stm_usb_lp_isr(void)
 }
 
 void
-stm_usb_fs_wkup(void)
+stm_usb_fs_wkup_isr(void)
 {
 	/* USB wakeup, just clear the bit for now */
 	stm_usb.istr &= ~(1 << STM_USB_ISTR_WKUP);
@@ -932,7 +932,7 @@ _ao_usb_out_recv(void)
 	_ao_usb_set_stat_rx(AO_USB_OUT_EPR, STM_USB_EPR_STAT_RX_VALID);
 }
 
-int
+static int
 _ao_usb_pollchar(void)
 {
 	uint8_t c;
diff --git a/src/stmf0/ao_interrupt.c b/src/stmf0/ao_interrupt.c
index 81878d89..ab835bac 100644
--- a/src/stmf0/ao_interrupt.c
+++ b/src/stmf0/ao_interrupt.c
@@ -43,12 +43,12 @@ extern char __interrupt_rom__, __interrupt_start__, __interrupt_end__;
 
 /* Interrupt functions */
 
-void stm_halt_isr(void)
+static void stm_halt_isr(void)
 {
 	ao_panic(AO_PANIC_CRASH);
 }
 
-void stm_ignore_isr(void)
+static void stm_ignore_isr(void)
 {
 }
 
diff --git a/src/stmf0/ao_usb_stm.c b/src/stmf0/ao_usb_stm.c
index ff294849..b736d389 100644
--- a/src/stmf0/ao_usb_stm.c
+++ b/src/stmf0/ao_usb_stm.c
@@ -245,7 +245,7 @@ static inline uint32_t ao_usb_epr_sw_buf_rx(uint32_t epr) {
  * Set current device address and mark the
  * interface as active
  */
-void
+static void
 ao_usb_set_address(uint8_t address)
 {
 	debug("ao_usb_set_address %02x\n", address);
@@ -957,7 +957,7 @@ ao_usb_ep0_handle(uint8_t receive)
 }
 
 #if AO_POWER_MANAGEMENT
-void
+static void
 ao_usb_suspend(void)
 {
 	stm_usb.cntr |= (1 << STM_USB_CNTR_FSUSP);
@@ -966,7 +966,7 @@ ao_usb_suspend(void)
 	ao_clock_suspend();
 }
 
-void
+static void
 ao_usb_wakeup(void)
 {
 	ao_clock_resume();
@@ -1371,7 +1371,7 @@ _ao_usb_out_recv(void)
 	_rx_dbg1("out_recv count", ao_usb_rx_count);
 }
 
-int
+static int
 _ao_usb_pollchar(void)
 {
 	uint8_t c;
diff --git a/src/telelco-v2.0/ao_lco_v2.c b/src/telelco-v2.0/ao_lco_v2.c
index daecf380..904dea0f 100644
--- a/src/telelco-v2.0/ao_lco_v2.c
+++ b/src/telelco-v2.0/ao_lco_v2.c
@@ -236,7 +236,7 @@ ao_lco_input(void)
  * visually inspect the system for correct operation
  */
 static void
-ao_lco_display_test()
+ao_lco_display_test(void)
 {
 	ao_mutex_get(&ao_lco_display_mutex);
 	ao_seven_segment_set(AO_LCO_PAD_DIGIT, 8 | 0x10);
@@ -279,7 +279,7 @@ ao_lco_main(void)
 }
 
 #if DEBUG
-void
+static void
 ao_lco_set_debug(void)
 {
 	uint16_t r = ao_cmd_decimal();