Explicitly add void to the argument list of zero argument functions.

This commit is contained in:
László Monda
2017-09-28 03:03:11 +02:00
parent ecf1ad2468
commit 751810ec4c
36 changed files with 49 additions and 50 deletions

View File

@@ -46,7 +46,7 @@ static void i2cSlaveCallback(I2C_Type *base, i2c_slave_transfer_t *xfer, void *u
prevEvent = xfer->event; prevEvent = xfer->event;
} }
void InitInterruptPriorities() void InitInterruptPriorities(void)
{ {
NVIC_SetPriority(I2C0_IRQn, 1); NVIC_SetPriority(I2C0_IRQn, 1);
NVIC_SetPriority(TPM1_IRQn, 1); NVIC_SetPriority(TPM1_IRQn, 1);

View File

@@ -38,7 +38,7 @@ static status_t i2cAsyncRead(uint8_t *data, size_t dataSize)
return I2C_MasterTransferNonBlocking(I2C_EEPROM_BUS_BASEADDR, &i2cHandle, &i2cTransfer); return I2C_MasterTransferNonBlocking(I2C_EEPROM_BUS_BASEADDR, &i2cHandle, &i2cTransfer);
} }
static status_t writePage() static status_t writePage(void)
{ {
static uint8_t buffer[EEPROM_BUFFER_SIZE]; static uint8_t buffer[EEPROM_BUFFER_SIZE];
uint16_t targetEepromOffset = sourceOffset + eepromStartAddress; uint16_t targetEepromOffset = sourceOffset + eepromStartAddress;

View File

@@ -34,7 +34,7 @@ void PIT_I2C_WATCHDOG_HANDLER(void)
PIT_ClearStatusFlags(PIT, kPIT_Chnl_0, PIT_TFLG_TIF_MASK); PIT_ClearStatusFlags(PIT, kPIT_Chnl_0, PIT_TFLG_TIF_MASK);
} }
void InitI2cWatchdog() void InitI2cWatchdog(void)
{ {
pit_config_t pitConfig; pit_config_t pitConfig;
PIT_GetDefaultConfig(&pitConfig); PIT_GetDefaultConfig(&pitConfig);

View File

@@ -8,6 +8,6 @@
// Functions: // Functions:
void InitI2cWatchdog(); void InitI2cWatchdog(void);
#endif #endif

View File

@@ -3,6 +3,6 @@
// Functions: // Functions:
void InitClock(); void InitClock(void);
#endif #endif

View File

@@ -14,14 +14,14 @@
#include "eeprom.h" #include "eeprom.h"
#include "microseconds/microseconds_pit.c" #include "microseconds/microseconds_pit.c"
void InitInterruptPriorities() void InitInterruptPriorities(void)
{ {
NVIC_SetPriority(I2C0_IRQn, 1); NVIC_SetPriority(I2C0_IRQn, 1);
NVIC_SetPriority(I2C1_IRQn, 1); NVIC_SetPriority(I2C1_IRQn, 1);
NVIC_SetPriority(USB0_IRQn, 1); NVIC_SetPriority(USB0_IRQn, 1);
} }
void InitI2c() void InitI2c(void)
{ {
port_pin_config_t pinConfig = { port_pin_config_t pinConfig = {
.pullSelect = kPORT_PullUp, .pullSelect = kPORT_PullUp,

View File

@@ -5,6 +5,6 @@
// Functions: // Functions:
void InitPeripherals(); void InitPeripherals(void);
#endif #endif

View File

@@ -90,6 +90,6 @@
// Variables: // Variables:
void UpdateActiveUsbReports(); void UpdateActiveUsbReports(void);
#endif #endif

View File

@@ -1,7 +1,7 @@
#include "led_pwm.h" #include "led_pwm.h"
#include "fsl_port.h" #include "fsl_port.h"
void LedPwm_Init() { void LedPwm_Init(void) {
CLOCK_EnableClock(LED_PWM_CLOCK); CLOCK_EnableClock(LED_PWM_CLOCK);
PORT_SetPinMux(LED_PWM_PORT, LED_PWM_PIN, kPORT_MuxAlt4); PORT_SetPinMux(LED_PWM_PORT, LED_PWM_PIN, kPORT_MuxAlt4);

View File

@@ -21,7 +21,7 @@
// Functions: // Functions:
void LedPwm_Init(); void LedPwm_Init(void);
void LedPwm_SetBrightness(uint8_t brightnessPercent); void LedPwm_SetBrightness(uint8_t brightnessPercent);
#endif #endif

View File

@@ -295,4 +295,3 @@ void Macros_ContinueMacro(void)
} }
ParseMacroAction(&UserConfigBuffer, &currentMacroAction); ParseMacroAction(&UserConfigBuffer, &currentMacroAction);
} }

View File

@@ -38,7 +38,7 @@ key_matrix_t KeyMatrix = {
uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
void UpdateUsbReports() void UpdateUsbReports(void)
{ {
if (!IsUsbBasicKeyboardReportSent) { if (!IsUsbBasicKeyboardReportSent) {
return; return;
@@ -63,17 +63,17 @@ void UpdateUsbReports()
bool IsEepromInitialized = false; bool IsEepromInitialized = false;
bool IsConfigInitialized = false; bool IsConfigInitialized = false;
void userConfigurationReadFinished() void userConfigurationReadFinished(void)
{ {
IsEepromInitialized = true; IsEepromInitialized = true;
} }
void hardwareConfigurationReadFinished() void hardwareConfigurationReadFinished(void)
{ {
EEPROM_LaunchTransfer(EepromTransfer_ReadUserConfiguration, userConfigurationReadFinished); EEPROM_LaunchTransfer(EepromTransfer_ReadUserConfiguration, userConfigurationReadFinished);
} }
void main() { void main(void) {
InitClock(); InitClock();
InitPeripherals(); InitPeripherals();
EEPROM_LaunchTransfer(EepromTransfer_ReadHardwareConfiguration, hardwareConfigurationReadFinished); EEPROM_LaunchTransfer(EepromTransfer_ReadHardwareConfiguration, hardwareConfigurationReadFinished);

View File

@@ -18,6 +18,6 @@
extern key_matrix_t KeyMatrix; extern key_matrix_t KeyMatrix;
extern uint8_t PreviousKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; extern uint8_t PreviousKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
extern uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; extern uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE];
extern void UpdateUsbReports(); extern void UpdateUsbReports(void);
#endif #endif

View File

@@ -1,7 +1,7 @@
#include "peripherals/led_driver.h" #include "peripherals/led_driver.h"
#include "i2c_addresses.h" #include "i2c_addresses.h"
void InitLedDriver() void InitLedDriver(void)
{ {
CLOCK_EnableClock(LED_DRIVER_SDB_CLOCK); CLOCK_EnableClock(LED_DRIVER_SDB_CLOCK);
PORT_SetPinMux(LED_DRIVER_SDB_PORT, LED_DRIVER_SDB_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(LED_DRIVER_SDB_PORT, LED_DRIVER_SDB_PIN, kPORT_MuxAsGpio);

View File

@@ -44,6 +44,6 @@
// Functions: // Functions:
void InitLedDriver(); void InitLedDriver(void);
#endif #endif

View File

@@ -1,7 +1,7 @@
#include "merge_sensor.h" #include "merge_sensor.h"
#include "fsl_port.h" #include "fsl_port.h"
void InitMergeSensor() { void InitMergeSensor(void) {
CLOCK_EnableClock(MERGE_SENSOR_CLOCK); CLOCK_EnableClock(MERGE_SENSOR_CLOCK);
PORT_SetPinConfig(MERGE_SENSOR_PORT, MERGE_SENSOR_PIN, PORT_SetPinConfig(MERGE_SENSOR_PORT, MERGE_SENSOR_PIN,
&(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio}); &(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio});

View File

@@ -18,6 +18,6 @@
// Functions: // Functions:
void InitMergeSensor(); void InitMergeSensor(void);
#endif #endif

View File

@@ -1,7 +1,7 @@
#include "reset_button.h" #include "reset_button.h"
#include "fsl_port.h" #include "fsl_port.h"
void InitResetButton() { void InitResetButton(void) {
CLOCK_EnableClock(RESET_BUTTON_CLOCK); CLOCK_EnableClock(RESET_BUTTON_CLOCK);
PORT_SetPinConfig(RESET_BUTTON_PORT, RESET_BUTTON_PIN, PORT_SetPinConfig(RESET_BUTTON_PORT, RESET_BUTTON_PIN,
&(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio}); &(port_pin_config_t){.pullSelect=kPORT_PullUp, .mux=kPORT_MuxAsGpio});

View File

@@ -18,6 +18,6 @@
// Functions: // Functions:
void InitResetButton(); void InitResetButton(void);
#endif #endif

View File

@@ -1,7 +1,7 @@
#include "test_led.h" #include "test_led.h"
#include "fsl_port.h" #include "fsl_port.h"
extern void InitTestLed() extern void InitTestLed(void)
{ {
CLOCK_EnableClock(TEST_LED_CLOCK); CLOCK_EnableClock(TEST_LED_CLOCK);
PORT_SetPinMux(TEST_LED_GPIO_PORT, TEST_LED_GPIO_PIN, kPORT_MuxAsGpio); PORT_SetPinMux(TEST_LED_GPIO_PORT, TEST_LED_GPIO_PIN, kPORT_MuxAsGpio);

View File

@@ -22,6 +22,6 @@
// Functions: // Functions:
void InitTestLed(); void InitTestLed(void);
#endif #endif

View File

@@ -15,11 +15,11 @@ static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
static i2c_message_t rxMessage; static i2c_message_t rxMessage;
static i2c_message_t txMessage; static i2c_message_t txMessage;
static status_t tx() { static status_t tx(void) {
return I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage); return I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage);
} }
static status_t rx() { static status_t rx(void) {
return I2cAsyncReadMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &rxMessage); return I2cAsyncReadMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &rxMessage);
} }

View File

@@ -51,7 +51,7 @@ static void masterCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t
} while (!isTransferScheduled); } while (!isTransferScheduled);
} }
void InitSlaveScheduler() void InitSlaveScheduler(void)
{ {
previousSlaveId = 0; previousSlaveId = 0;
currentSlaveId = 0; currentSlaveId = 0;

View File

@@ -39,7 +39,7 @@
// Functions: // Functions:
void InitSlaveScheduler(); void InitSlaveScheduler(void);
void SetLeds(uint8_t ledBrightness); void SetLeds(uint8_t ledBrightness);
#endif #endif

View File

@@ -106,7 +106,7 @@ void USB0_IRQHandler(void)
: UsbCompositeDevice.deviceHandle); : UsbCompositeDevice.deviceHandle);
} }
void InitUsb() void InitUsb(void)
{ {
uint8_t usbDeviceKhciIrq[] = USB_IRQS; uint8_t usbDeviceKhciIrq[] = USB_IRQS;
uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0]; uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];

View File

@@ -32,6 +32,6 @@
//Functions: //Functions:
void InitUsb(); void InitUsb(void);
#endif #endif

View File

@@ -44,17 +44,17 @@ static usb_basic_keyboard_report_t usbBasicKeyboardReports[2];
usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports; usb_basic_keyboard_report_t* ActiveUsbBasicKeyboardReport = usbBasicKeyboardReports;
bool IsUsbBasicKeyboardReportSent = false; bool IsUsbBasicKeyboardReportSent = false;
usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport() usb_basic_keyboard_report_t* getInactiveUsbBasicKeyboardReport(void)
{ {
return ActiveUsbBasicKeyboardReport == usbBasicKeyboardReports ? usbBasicKeyboardReports+1 : usbBasicKeyboardReports; return ActiveUsbBasicKeyboardReport == usbBasicKeyboardReports ? usbBasicKeyboardReports+1 : usbBasicKeyboardReports;
} }
void SwitchActiveUsbBasicKeyboardReport() void SwitchActiveUsbBasicKeyboardReport(void)
{ {
ActiveUsbBasicKeyboardReport = getInactiveUsbBasicKeyboardReport(); ActiveUsbBasicKeyboardReport = getInactiveUsbBasicKeyboardReport();
} }
void ResetActiveUsbBasicKeyboardReport() void ResetActiveUsbBasicKeyboardReport(void)
{ {
bzero(ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH); bzero(ActiveUsbBasicKeyboardReport, USB_BASIC_KEYBOARD_REPORT_LENGTH);
} }

View File

@@ -40,7 +40,7 @@
usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration); usb_status_t UsbBasicKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); usb_status_t UsbBasicKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
void ResetActiveUsbBasicKeyboardReport(); void ResetActiveUsbBasicKeyboardReport(void);
void SwitchActiveUsbBasicKeyboardReport(); void SwitchActiveUsbBasicKeyboardReport(void);
#endif #endif

View File

@@ -44,7 +44,7 @@ usb_device_class_struct_t UsbGenericHidClass = {
uint8_t GenericHidInBuffer[USB_GENERIC_HID_IN_BUFFER_LENGTH]; uint8_t GenericHidInBuffer[USB_GENERIC_HID_IN_BUFFER_LENGTH];
uint8_t GenericHidOutBuffer[USB_GENERIC_HID_OUT_BUFFER_LENGTH]; uint8_t GenericHidOutBuffer[USB_GENERIC_HID_OUT_BUFFER_LENGTH];
static usb_status_t UsbReceiveData() static usb_status_t UsbReceiveData(void)
{ {
return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle, return USB_DeviceHidRecv(UsbCompositeDevice.genericHidHandle,
USB_GENERIC_HID_ENDPOINT_OUT_INDEX, USB_GENERIC_HID_ENDPOINT_OUT_INDEX,

View File

@@ -44,17 +44,17 @@ static usb_media_keyboard_report_t usbMediaKeyboardReports[2];
usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports; usb_media_keyboard_report_t* ActiveUsbMediaKeyboardReport = usbMediaKeyboardReports;
bool IsUsbMediaKeyboardReportSent = false; bool IsUsbMediaKeyboardReportSent = false;
usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport() usb_media_keyboard_report_t* getInactiveUsbMediaKeyboardReport(void)
{ {
return ActiveUsbMediaKeyboardReport == usbMediaKeyboardReports ? usbMediaKeyboardReports+1 : usbMediaKeyboardReports; return ActiveUsbMediaKeyboardReport == usbMediaKeyboardReports ? usbMediaKeyboardReports+1 : usbMediaKeyboardReports;
} }
void SwitchActiveUsbMediaKeyboardReport() void SwitchActiveUsbMediaKeyboardReport(void)
{ {
ActiveUsbMediaKeyboardReport = getInactiveUsbMediaKeyboardReport(); ActiveUsbMediaKeyboardReport = getInactiveUsbMediaKeyboardReport();
} }
void ResetActiveUsbMediaKeyboardReport() void ResetActiveUsbMediaKeyboardReport(void)
{ {
bzero(ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH); bzero(ActiveUsbMediaKeyboardReport, USB_MEDIA_KEYBOARD_REPORT_LENGTH);
} }

View File

@@ -38,7 +38,7 @@
usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration); usb_status_t UsbMediaKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); usb_status_t UsbMediaKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
void ResetActiveUsbMediaKeyboardReport(); void ResetActiveUsbMediaKeyboardReport(void);
void SwitchActiveUsbMediaKeyboardReport(); void SwitchActiveUsbMediaKeyboardReport(void);
#endif #endif

View File

@@ -39,7 +39,7 @@ usb_device_class_struct_t UsbMouseClass = {
usb_mouse_report_t UsbMouseReport; usb_mouse_report_t UsbMouseReport;
static volatile usb_status_t usbMouseAction() static volatile usb_status_t usbMouseAction(void)
{ {
return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX, return USB_DeviceHidSend(UsbCompositeDevice.mouseHandle, USB_MOUSE_ENDPOINT_INDEX,
(uint8_t*)&UsbMouseReport, USB_MOUSE_REPORT_LENGTH); (uint8_t*)&UsbMouseReport, USB_MOUSE_REPORT_LENGTH);

View File

@@ -49,12 +49,12 @@ usb_system_keyboard_report_t* getInactiveUsbSystemKeyboardReport()
return ActiveUsbSystemKeyboardReport == usbSystemKeyboardReports ? usbSystemKeyboardReports+1 : usbSystemKeyboardReports; return ActiveUsbSystemKeyboardReport == usbSystemKeyboardReports ? usbSystemKeyboardReports+1 : usbSystemKeyboardReports;
} }
void SwitchActiveUsbSystemKeyboardReport() void SwitchActiveUsbSystemKeyboardReport(void)
{ {
ActiveUsbSystemKeyboardReport = getInactiveUsbSystemKeyboardReport(); ActiveUsbSystemKeyboardReport = getInactiveUsbSystemKeyboardReport();
} }
void ResetActiveUsbSystemKeyboardReport() void ResetActiveUsbSystemKeyboardReport(void)
{ {
bzero(ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH); bzero(ActiveUsbSystemKeyboardReport, USB_SYSTEM_KEYBOARD_REPORT_LENGTH);
} }

View File

@@ -38,7 +38,7 @@
usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration); usb_status_t UsbSystemKeyboardSetConfiguration(class_handle_t handle, uint8_t configuration);
usb_status_t UsbSystemKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting); usb_status_t UsbSystemKeyboardSetInterface(class_handle_t handle, uint8_t interface, uint8_t alternateSetting);
void ResetActiveUsbSystemKeyboardReport(); void ResetActiveUsbSystemKeyboardReport(void);
void SwitchActiveUsbSystemKeyboardReport(); void SwitchActiveUsbSystemKeyboardReport(void);
#endif #endif

View File

@@ -37,7 +37,7 @@
// Functions: // Functions:
void UsbProtocolHandler(); void UsbProtocolHandler(void);
void ApplyConfig(void); void ApplyConfig(void);
#endif #endif

View File

@@ -72,7 +72,7 @@ void processMouseAction(key_action_t action)
wasPreviousMouseActionWheelAction = isWheelAction; wasPreviousMouseActionWheelAction = isWheelAction;
} }
uint8_t getActiveLayer() uint8_t getActiveLayer(void)
{ {
uint8_t activeLayer = LAYER_ID_BASE; uint8_t activeLayer = LAYER_ID_BASE;
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) { for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
@@ -88,7 +88,7 @@ uint8_t getActiveLayer()
return activeLayer; return activeLayer;
} }
void UpdateActiveUsbReports() void UpdateActiveUsbReports(void)
{ {
bzero(&UsbMouseReport, sizeof(usb_mouse_report_t)); bzero(&UsbMouseReport, sizeof(usb_mouse_report_t));