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

Rename UsbResponse_*() to UsbStatusCode_*(), SetUsbError() to SetUsbStatusCode(), and other USB status codes consistently.

Browse Source
This commit is contained in:
László Monda
2017-11-05 19:25:13 +01:00
parent eb451d6153
commit 6db3eb3045
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ void UsbCommand_ApplyConfig(void)
*(uint16_t*)(GenericHidOutBuffer+1) = StagingUserConfigBuffer.offset; *(uint16_t*)(GenericHidOutBuffer+1) = StagingUserConfigBuffer.offset;
GenericHidOutBuffer[3] = 0; GenericHidOutBuffer[3] = 0;
if (GenericHidOutBuffer[0] != UsbResponse_Success) { if (GenericHidOutBuffer[0] != UsbStatusCode_Success) {
return; return;
} }
@@ -37,7 +37,7 @@ void UsbCommand_ApplyConfig(void)
*(uint16_t*)(GenericHidOutBuffer+1) = ValidatedUserConfigBuffer.offset; *(uint16_t*)(GenericHidOutBuffer+1) = ValidatedUserConfigBuffer.offset;
GenericHidOutBuffer[3] = 1; GenericHidOutBuffer[3] = 1;
if (GenericHidOutBuffer[0] != UsbResponse_Success) { if (GenericHidOutBuffer[0] != UsbStatusCode_Success) {
return; return;
} }

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

@@ -27,7 +27,7 @@ void UsbCommand_GetProperty(void)
SetUsbResponseWord(USER_CONFIG_SIZE); SetUsbResponseWord(USER_CONFIG_SIZE);
break; break;
default: default:
SetUsbError(1); SetUsbStatusCode(1);
break; break;
} }
} }

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

@@ -6,7 +6,7 @@ void UsbCommand_JumpToSlaveBootloader(void)
uint8_t uhkModuleDriverId = GenericHidInBuffer[1]; uint8_t uhkModuleDriverId = GenericHidInBuffer[1];
if (uhkModuleDriverId >= UHK_MODULE_MAX_COUNT) { if (uhkModuleDriverId >= UHK_MODULE_MAX_COUNT) {
SetUsbError(JumpToBootloaderError_InvalidModuleDriverId); SetUsbStatusCode(UsbStatusCode_JumpToSlaveBootloader_InvalidModuleDriverId);
return; return;
} }

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

@@ -9,7 +9,7 @@ void UsbCommand_ReadConfig(bool isHardware)
uint16_t offset = *(uint16_t*)(GenericHidInBuffer+2); uint16_t offset = *(uint16_t*)(GenericHidInBuffer+2);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) { if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) {
SetUsbError(ConfigTransferResponse_LengthTooLarge); SetUsbStatusCode(UsbStatusCode_TransferConfig_LengthTooLarge);
return; return;
} }
@@ -17,7 +17,7 @@ void UsbCommand_ReadConfig(bool isHardware)
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE; uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) { if (offset + length > bufferLength) {
SetUsbError(ConfigTransferResponse_BufferOutOfBounds); SetUsbStatusCode(UsbStatusCode_TransferConfig_BufferOutOfBounds);
return; return;
} }

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

@@ -9,7 +9,7 @@ void UsbCommand_WriteConfig(bool isHardware)
uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1)); uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1));
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1-1-2) { if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1-1-2) {
SetUsbError(ConfigTransferResponse_LengthTooLarge); SetUsbStatusCode(UsbStatusCode_TransferConfig_LengthTooLarge);
return; return;
} }
@@ -17,7 +17,7 @@ void UsbCommand_WriteConfig(bool isHardware)
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE; uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) { if (offset + length > bufferLength) {
SetUsbError(ConfigTransferResponse_BufferOutOfBounds); SetUsbStatusCode(UsbStatusCode_TransferConfig_BufferOutOfBounds);
return; return;
} }

4
right/src/usb_protocol_handler.c
View File

@@ -13,7 +13,7 @@
#include "usb_commands/usb_command_jump_to_slave_bootloader.h" #include "usb_commands/usb_command_jump_to_slave_bootloader.h"
#include "usb_commands/usb_command_send_kboot_command.h" #include "usb_commands/usb_command_send_kboot_command.h"
void SetUsbError(uint8_t error) void SetUsbStatusCode(uint8_t error)
{ {
GenericHidOutBuffer[0] = error; GenericHidOutBuffer[0] = error;
} }
@@ -79,7 +79,7 @@ void UsbProtocolHandler(void)
UsbCommand_SendKbootCommand(); UsbCommand_SendKbootCommand();
break; break;
default: default:
SetUsbError(UsbResponse_InvalidCommand); SetUsbStatusCode(UsbStatusCode_InvalidCommand);
break; break;
} }
} }

12
right/src/usb_protocol_handler.h
View File

@@ -27,23 +27,23 @@
} usb_command_id_t; } usb_command_id_t;
typedef enum { typedef enum {
UsbResponse_Success = 0, UsbStatusCode_Success = 0,
UsbResponse_InvalidCommand = 1, UsbStatusCode_InvalidCommand = 1,
} usb_response_t; } usb_response_t;
typedef enum { typedef enum {
ConfigTransferResponse_LengthTooLarge = 1, UsbStatusCode_TransferConfig_LengthTooLarge = 1,
ConfigTransferResponse_BufferOutOfBounds = 2, UsbStatusCode_TransferConfig_BufferOutOfBounds = 2,
} config_transfer_response_t; } config_transfer_response_t;
typedef enum { typedef enum {
JumpToBootloaderError_InvalidModuleDriverId = 1, UsbStatusCode_JumpToSlaveBootloader_InvalidModuleDriverId = 1,
} jump_to_bootloader_error_t; } jump_to_bootloader_error_t;
// Functions: // Functions:
void UsbProtocolHandler(void); void UsbProtocolHandler(void);
void SetUsbError(uint8_t error); void SetUsbStatusCode(uint8_t status);
void SetUsbResponseByte(uint8_t response); void SetUsbResponseByte(uint8_t response);
void SetUsbResponseWord(uint16_t response); void SetUsbResponseWord(uint16_t response);