uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace {GET,SET}_USB_BUFFER_UINT8 with {Get,Set}UsbRxBufferUint8

Browse Source
This commit is contained in:
László Monda
2017-11-11 16:49:48 +01:00
parent f4de0df149
commit 22141ba1e3
14 changed files with 75 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
right/src/usb_commands/usb_command_apply_config.c
View File

@@ -6,9 +6,9 @@
void updateUsbBuffer(uint8_t usbStatusCode, uint16_t parserOffset, parser_stage_t parserStage)
{
SET_USB_BUFFER_UINT8(0, usbStatusCode);
SET_USB_BUFFER_UINT16(1, parserOffset);
SET_USB_BUFFER_UINT8(3, parserStage);
SetUsbTxBufferUint8(0, usbStatusCode);
SetUsbTxBufferUint16(1, parserOffset);
SetUsbTxBufferUint8(3, parserStage);
}
void UsbCommand_ApplyConfig(void)

2
right/src/usb_commands/usb_command_get_adc_value.c
View File

@@ -4,5 +4,5 @@
void UsbCommand_GetAdcValue(void)
{
SET_USB_BUFFER_UINT32(1, ADC_Measure());
SetUsbTxBufferUint32(1, ADC_Measure());
}

10
right/src/usb_commands/usb_command_get_keyboard_state.c
View File

@@ -7,9 +7,9 @@
void UsbCommand_GetKeyboardState(void)
{
SET_USB_BUFFER_UINT8(1, IsEepromBusy);
SET_USB_BUFFER_UINT8(2, MERGE_SENSOR_IS_MERGED);
SET_USB_BUFFER_UINT8(3, UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].moduleId);
SET_USB_BUFFER_UINT8(4, UhkModuleStates[UhkModuleDriverId_LeftAddon].moduleId);
SET_USB_BUFFER_UINT8(5, UhkModuleStates[UhkModuleDriverId_RightAddon].moduleId);
SetUsbTxBufferUint8(1, IsEepromBusy);
SetUsbTxBufferUint8(2, MERGE_SENSOR_IS_MERGED);
SetUsbTxBufferUint8(3, UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].moduleId);
SetUsbTxBufferUint8(4, UhkModuleStates[UhkModuleDriverId_LeftAddon].moduleId);
SetUsbTxBufferUint8(5, UhkModuleStates[UhkModuleDriverId_RightAddon].moduleId);
}

16
right/src/usb_commands/usb_command_get_property.c
View File

@@ -5,29 +5,29 @@
void UsbCommand_GetProperty(void)
{
uint8_t propertyId = GET_USB_BUFFER_UINT8(1);
uint8_t propertyId = GetUsbRxBufferUint8(1);
switch (propertyId) {
case SystemPropertyId_UsbProtocolVersion:
SET_USB_BUFFER_UINT8(1, SYSTEM_PROPERTY_USB_PROTOCOL_VERSION);
SetUsbTxBufferUint8(1, SYSTEM_PROPERTY_USB_PROTOCOL_VERSION);
break;
case SystemPropertyId_BridgeProtocolVersion:
SET_USB_BUFFER_UINT8(1, SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION);
SetUsbTxBufferUint8(1, SYSTEM_PROPERTY_BRIDGE_PROTOCOL_VERSION);
break;
case SystemPropertyId_DataModelVersion:
SET_USB_BUFFER_UINT8(1, SYSTEM_PROPERTY_DATA_MODEL_VERSION);
SetUsbTxBufferUint8(1, SYSTEM_PROPERTY_DATA_MODEL_VERSION);
break;
case SystemPropertyId_FirmwareVersion:
SET_USB_BUFFER_UINT8(1, SYSTEM_PROPERTY_FIRMWARE_VERSION);
SetUsbTxBufferUint8(1, SYSTEM_PROPERTY_FIRMWARE_VERSION);
break;
case SystemPropertyId_HardwareConfigSize:
SET_USB_BUFFER_UINT16(1, HARDWARE_CONFIG_SIZE);
SetUsbTxBufferUint16(1, HARDWARE_CONFIG_SIZE);
break;
case SystemPropertyId_UserConfigSize:
SET_USB_BUFFER_UINT16(1, USER_CONFIG_SIZE);
SetUsbTxBufferUint16(1, USER_CONFIG_SIZE);
break;
default:
SET_USB_BUFFER_UINT8(0, UsbStatusCode_GetProperty_InvalidProperty);
SetUsbTxBufferUint8(0, UsbStatusCode_GetProperty_InvalidProperty);
break;
}
}

4
right/src/usb_commands/usb_command_jump_to_slave_bootloader.c
View File

@@ -5,10 +5,10 @@
void UsbCommand_JumpToSlaveBootloader(void)
{
uint8_t slotId = GET_USB_BUFFER_UINT8(1);
uint8_t slotId = GetUsbRxBufferUint8(1);
if (!IS_VALID_SLAVE_SLOT(slotId)) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_JumpToSlaveBootloader_InvalidSlaveSlotId);
SetUsbTxBufferUint8(0, UsbStatusCode_JumpToSlaveBootloader_InvalidSlaveSlotId);
return;
}

2
right/src/usb_commands/usb_command_launch_eeprom_transfer_legacy.c
View File

@@ -5,7 +5,7 @@
void UsbCommand_LaunchEepromTransferLegacy(void)
{
uint8_t legacyEepromTransferId = GET_USB_BUFFER_UINT8(1);
uint8_t legacyEepromTransferId = GetUsbRxBufferUint8(1);
switch (legacyEepromTransferId) {
case 0:
EEPROM_LaunchTransfer(EepromOperation_Read, ConfigBufferId_HardwareConfig, NULL);

8
right/src/usb_commands/usb_command_read_config.c
View File

@@ -5,11 +5,11 @@
void UsbCommand_ReadConfig(bool isHardware)
{
uint8_t length = GET_USB_BUFFER_UINT8(1);
uint16_t offset = GET_USB_BUFFER_UINT16(2);
uint8_t length = GetUsbRxBufferUint8(1);
uint16_t offset = GetUsbRxBufferUint16(2);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH - USB_STATUS_CODE_SIZE) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_ReadConfig_LengthTooLarge);
SetUsbTxBufferUint8(0, UsbStatusCode_ReadConfig_LengthTooLarge);
return;
}
@@ -17,7 +17,7 @@ void UsbCommand_ReadConfig(bool isHardware)
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_ReadConfig_BufferOutOfBounds);
SetUsbTxBufferUint8(0, UsbStatusCode_ReadConfig_BufferOutOfBounds);
return;
}

4
right/src/usb_commands/usb_command_reenumerate.c
View File

@@ -6,7 +6,7 @@
void UsbCommand_Reenumerate(void)
{
Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;
Wormhole.enumerationMode = GET_USB_BUFFER_UINT8(1);
Wormhole.timeoutMs = GET_USB_BUFFER_UINT32(2);
Wormhole.enumerationMode = GetUsbRxBufferUint8(1);
Wormhole.timeoutMs = GetUsbRxBufferUint32(2);
NVIC_SystemReset();
}

4
right/src/usb_commands/usb_command_send_kboot_command.c
View File

@@ -5,6 +5,6 @@
void UsbCommand_SendKbootCommand(void)
{
KbootDriverState.phase = 0;
KbootDriverState.i2cAddress = GET_USB_BUFFER_UINT8(2);
KbootDriverState.commandType = GET_USB_BUFFER_UINT8(1); // Command should be set last.
KbootDriverState.i2cAddress = GetUsbRxBufferUint8(2);
KbootDriverState.commandType = GetUsbRxBufferUint8(1); // Command should be set last.
}

2
right/src/usb_commands/usb_command_set_led_pwm_brightness.c
View File

@@ -5,7 +5,7 @@
void UsbCommand_SetLedPwmBrightness(void)
{
uint8_t brightnessPercent = GET_USB_BUFFER_UINT8(1);
uint8_t brightnessPercent = GetUsbRxBufferUint8(1);
LedPwm_SetBrightness(brightnessPercent);
UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.ledPwmBrightness = brightnessPercent;
}

2
right/src/usb_commands/usb_command_set_test_led.c
View File

@@ -5,7 +5,7 @@
void UsbCommand_SetTestLed(void)
{
bool isTestLedOn = GET_USB_BUFFER_UINT8(1);
bool isTestLedOn = GetUsbRxBufferUint8(1);
TEST_LED_SET(isTestLedOn);
UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.isTestLedOn = isTestLedOn;
}

8
right/src/usb_commands/usb_command_write_config.c
View File

@@ -5,12 +5,12 @@
void UsbCommand_WriteConfig(bool isHardware)
{
uint8_t length = GET_USB_BUFFER_UINT8(1);
uint16_t offset = GET_USB_BUFFER_UINT16(2);
uint8_t length = GetUsbRxBufferUint8(1);
uint16_t offset = GetUsbRxBufferUint16(2);
const uint8_t paramsSize = USB_STATUS_CODE_SIZE + sizeof(length) + sizeof(offset);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH - paramsSize) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_WriteConfig_LengthTooLarge);
SetUsbTxBufferUint8(0, UsbStatusCode_WriteConfig_LengthTooLarge);
return;
}
@@ -18,7 +18,7 @@ void UsbCommand_WriteConfig(bool isHardware)
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_WriteConfig_BufferOutOfBounds);
SetUsbTxBufferUint8(0, UsbStatusCode_WriteConfig_BufferOutOfBounds);
return;
}