diff options
author | Keith Packard <keithp@keithp.com> | 2019-02-04 22:24:37 -0800 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2019-02-18 13:08:23 -0800 |
commit | c11427819ca24bb77523496309b5b6f699d126c5 (patch) | |
tree | 29cab045cde088881d971b175708245b17d09ce6 /src/kernel | |
parent | 119a829e58aff5dd7801fe7ef8cae886bf31fec1 (diff) |
altos: Mark local functions 'static'
Working towards supporting -Wmissing-prototypes
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'src/kernel')
-rw-r--r-- | src/kernel/ao_config.c | 90 | ||||
-rw-r--r-- | src/kernel/ao_gps_report_metrum.c | 2 | ||||
-rw-r--r-- | src/kernel/ao_ignite.c | 10 | ||||
-rw-r--r-- | src/kernel/ao_log.c | 6 | ||||
-rw-r--r-- | src/kernel/ao_monitor.c | 6 | ||||
-rw-r--r-- | src/kernel/ao_report.c | 2 | ||||
-rw-r--r-- | src/kernel/ao_storage.c | 6 | ||||
-rw-r--r-- | src/kernel/ao_telemetry.c | 2 |
8 files changed, 62 insertions, 62 deletions
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; |