From 13a718f8716a71bd35ef6e826f601e2d07e74b9e Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Sun, 11 Mar 2018 02:36:57 +0100 Subject: [PATCH] Declare local functions and variables static This both helps the compiler and the programmer --- right/src/eeprom.c | 2 +- right/src/eeprom.h | 1 - right/src/init_peripherals.c | 14 ++++++------- right/src/main.c | 8 ++++---- right/src/peripherals/adc.c | 2 +- .../usb_interface_basic_keyboard.c | 2 +- .../usb_interface_media_keyboard.c | 2 +- .../src/usb_interfaces/usb_interface_mouse.c | 2 +- .../usb_interface_system_keyboard.c | 2 +- right/src/usb_report_updater.c | 20 +++++++++---------- 10 files changed, 27 insertions(+), 28 deletions(-) diff --git a/right/src/eeprom.c b/right/src/eeprom.c index 3dfa761..5dd0893 100644 --- a/right/src/eeprom.c +++ b/right/src/eeprom.c @@ -9,7 +9,7 @@ volatile bool IsEepromBusy; static eeprom_operation_t CurrentEepromOperation; static config_buffer_id_t CurrentConfigBufferId; -status_t LastEepromTransferStatus; +static status_t LastEepromTransferStatus; void (*SuccessCallback)(void); static i2c_master_handle_t i2cHandle; diff --git a/right/src/eeprom.h b/right/src/eeprom.h index f0d6250..4ca6ad7 100644 --- a/right/src/eeprom.h +++ b/right/src/eeprom.h @@ -25,7 +25,6 @@ // Variables: extern volatile bool IsEepromBusy; - extern status_t EepromTransferStatus; // Functions: diff --git a/right/src/init_peripherals.c b/right/src/init_peripherals.c index a887f39..44136a3 100644 --- a/right/src/init_peripherals.c +++ b/right/src/init_peripherals.c @@ -21,7 +21,7 @@ bool IsBusPalOn; volatile uint32_t I2cMainBusRequestedBaudRateBps = I2C_MAIN_BUS_NORMAL_BAUD_RATE; volatile uint32_t I2cMainBusActualBaudRateBps; -void initBusPalState(void) { +static void initBusPalState(void) { IsBusPalOn = Wormhole.magicNumber == WORMHOLE_MAGIC_NUMBER && Wormhole.enumerationMode == EnumerationMode_BusPal; if (IsBusPalOn) { Wormhole.magicNumber = 0; @@ -29,7 +29,7 @@ void initBusPalState(void) { } } -void initInterruptPriorities(void) +static void initInterruptPriorities(void) { NVIC_SetPriority(PIT_I2C_WATCHDOG_IRQ_ID, 1); NVIC_SetPriority(PIT_TIMER_IRQ_ID, 2); @@ -40,12 +40,12 @@ void initInterruptPriorities(void) NVIC_SetPriority(USB_IRQ_ID, 3); } -void delay(void) +static void delay(void) { for (volatile uint32_t i=0; i<62; i++); } -void recoverI2c(void) +static void recoverI2c(void) { PORT_SetPinMux(I2C_MAIN_BUS_SDA_PORT, I2C_MAIN_BUS_SDA_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(I2C_MAIN_BUS_SCL_PORT, I2C_MAIN_BUS_SCL_PIN, kPORT_MuxAsGpio); @@ -74,7 +74,7 @@ void recoverI2c(void) delay(); } -void initI2cMainBus(void) +static void initI2cMainBus(void) { CLOCK_EnableClock(I2C_MAIN_BUS_SDA_CLOCK); CLOCK_EnableClock(I2C_MAIN_BUS_SCL_CLOCK); @@ -105,7 +105,7 @@ void ReinitI2cMainBus(void) InitSlaveScheduler(); } -void initI2cEepromBus(void) +static void initI2cEepromBus(void) { port_pin_config_t pinConfig = { .pullSelect = kPORT_PullUp, @@ -126,7 +126,7 @@ void initI2cEepromBus(void) I2C_MasterInit(I2C_EEPROM_BUS_BASEADDR, &masterConfig, sourceClock); } -void initI2c(void) +static void initI2c(void) { initI2cMainBus(); initI2cEepromBus(); diff --git a/right/src/main.c b/right/src/main.c index 60a8c61..2897680 100644 --- a/right/src/main.c +++ b/right/src/main.c @@ -11,15 +11,15 @@ #include "peripherals/reset_button.h" #include "usb_report_updater.h" -bool IsEepromInitialized = false; -bool IsConfigInitialized = false; +static bool IsEepromInitialized = false; +static bool IsConfigInitialized = false; -void userConfigurationReadFinished(void) +static void userConfigurationReadFinished(void) { IsEepromInitialized = true; } -void hardwareConfigurationReadFinished(void) +static void hardwareConfigurationReadFinished(void) { EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_StagingUserConfig, userConfigurationReadFinished); } diff --git a/right/src/peripherals/adc.c b/right/src/peripherals/adc.c index 5803db0..0d79eeb 100644 --- a/right/src/peripherals/adc.c +++ b/right/src/peripherals/adc.c @@ -2,7 +2,7 @@ #include "fsl_port.h" #include "peripherals/adc.h" -adc16_channel_config_t adc16ChannelConfigStruct; +static adc16_channel_config_t adc16ChannelConfigStruct; void ADC_Init(void) { diff --git a/right/src/usb_interfaces/usb_interface_basic_keyboard.c b/right/src/usb_interfaces/usb_interface_basic_keyboard.c index 6d4b4b4..f1bef4f 100644 --- a/right/src/usb_interfaces/usb_interface_basic_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_basic_keyboard.c @@ -7,7 +7,7 @@ usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardRepo volatile bool IsUsbBasicKeyboardReportSent = false; static uint8_t usbBasicKeyboardInBuffer[USB_BASIC_KEYBOARD_REPORT_LENGTH]; -usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void) +static usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void) { return ActiveUsbBasicKeyboardReport == usbBasicKeyboardReports ? usbBasicKeyboardReports+1 : usbBasicKeyboardReports; } diff --git a/right/src/usb_interfaces/usb_interface_media_keyboard.c b/right/src/usb_interfaces/usb_interface_media_keyboard.c index d818ddf..8147734 100644 --- a/right/src/usb_interfaces/usb_interface_media_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_media_keyboard.c @@ -5,7 +5,7 @@ static usb_media_keyboard_report_t usbMediaKeyboardReports[2]; usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports; volatile bool IsUsbMediaKeyboardReportSent = false; -usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void) +static usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void) { return ActiveUsbMediaKeyboardReport == usbMediaKeyboardReports ? usbMediaKeyboardReports+1 : usbMediaKeyboardReports; } diff --git a/right/src/usb_interfaces/usb_interface_mouse.c b/right/src/usb_interfaces/usb_interface_mouse.c index 94a6cad..711e3cd 100644 --- a/right/src/usb_interfaces/usb_interface_mouse.c +++ b/right/src/usb_interfaces/usb_interface_mouse.c @@ -5,7 +5,7 @@ static usb_mouse_report_t usbMouseReports[2]; usb_mouse_report_t* ActiveUsbMouseReport = usbMouseReports; volatile bool IsUsbMouseReportSent = false; -usb_mouse_report_t* getInactiveUsbMouseReport(void) +static usb_mouse_report_t* getInactiveUsbMouseReport(void) { return ActiveUsbMouseReport == usbMouseReports ? usbMouseReports+1 : usbMouseReports; } diff --git a/right/src/usb_interfaces/usb_interface_system_keyboard.c b/right/src/usb_interfaces/usb_interface_system_keyboard.c index 34a47a0..e039069 100644 --- a/right/src/usb_interfaces/usb_interface_system_keyboard.c +++ b/right/src/usb_interfaces/usb_interface_system_keyboard.c @@ -5,7 +5,7 @@ static usb_system_keyboard_report_t usbSystemKeyboardReports[2]; usb_system_keyboard_report_t* ActiveUsbSystemKeyboardReport = usbSystemKeyboardReports; volatile bool IsUsbSystemKeyboardReportSent = false; -usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport() +static usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport() { return ActiveUsbSystemKeyboardReport == usbSystemKeyboardReports ? usbSystemKeyboardReports+1 : usbSystemKeyboardReports; } diff --git a/right/src/usb_report_updater.c b/right/src/usb_report_updater.c index ab70eda..7fb3eeb 100644 --- a/right/src/usb_report_updater.c +++ b/right/src/usb_report_updater.c @@ -17,11 +17,11 @@ #include "config_parser/parse_keymap.h" #include "usb_commands/usb_command_get_debug_buffer.h" -uint32_t UsbReportUpdateTime = 0; +static uint32_t UsbReportUpdateTime = 0; static uint32_t elapsedTime; uint16_t DoubleTapSwitchLayerTimeout = 150; -uint16_t DoubleTapSwitchLayerReleaseTimeout = 100; +static uint16_t DoubleTapSwitchLayerReleaseTimeout = 100; static bool activeMouseStates[ACTIVE_MOUSE_STATES_COUNT]; @@ -53,7 +53,7 @@ mouse_kinetic_state_t MouseScrollState = { .acceleratedSpeed = 50, }; -void processMouseKineticState(mouse_kinetic_state_t *kineticState) +static void processMouseKineticState(mouse_kinetic_state_t *kineticState) { float initialSpeed = kineticState->intMultiplier * kineticState->initialSpeed; float acceleration = kineticState->intMultiplier * kineticState->acceleration; @@ -155,7 +155,7 @@ void processMouseKineticState(mouse_kinetic_state_t *kineticState) kineticState->wasMoveAction = isMoveAction; } -void processMouseActions() +static void processMouseActions() { processMouseKineticState(&MouseMoveState); ActiveUsbMouseReport->x = MouseMoveState.xOut; @@ -193,7 +193,7 @@ static uint8_t basicScancodeIndex = 0; static uint8_t mediaScancodeIndex = 0; static uint8_t systemScancodeIndex = 0; -void applyKeyAction(key_state_t *keyState, key_action_t *action) +static void applyKeyAction(key_state_t *keyState, key_action_t *action) { static key_state_t *doubleTapSwitchLayerKey; static uint32_t doubleTapSwitchLayerStartTime; @@ -265,7 +265,7 @@ static uint8_t secondaryRoleSlotId; static uint8_t secondaryRoleKeyId; static secondary_role_t secondaryRole; -void updateActiveUsbReports(void) +static void updateActiveUsbReports(void) { memset(activeMouseStates, 0, ACTIVE_MOUSE_STATES_COUNT); @@ -369,10 +369,10 @@ void updateActiveUsbReports(void) previousLayer = activeLayer; } -bool UsbBasicKeyboardReportEverSent = false; -bool UsbMediaKeyboardReportEverSent = false; -bool UsbSystemKeyboardReportEverSent = false; -bool UsbMouseReportEverSentEverSent = false; +static bool UsbBasicKeyboardReportEverSent = false; +static bool UsbMediaKeyboardReportEverSent = false; +static bool UsbSystemKeyboardReportEverSent = false; +static bool UsbMouseReportEverSentEverSent = false; uint32_t UsbReportUpdateCounter; static uint32_t lastUsbUpdateTime;