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

Split usb_status_code_transfer_config_t as usb_status_code_read_config_t and usb_status_code_write_config_t

Browse Source
This commit is contained in:
László Monda
2017-11-05 22:14:49 +01:00
parent a8bde4e007
commit f7e26eef8a
5 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ void UsbCommand_ReadConfig(bool isHardware)
uint16_t offset = GET_USB_BUFFER_UINT16(2); uint16_t offset = GET_USB_BUFFER_UINT16(2);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) { if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_LengthTooLarge); SET_USB_BUFFER_UINT8(0, UsbStatusCode_ReadConfig_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) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_BufferOutOfBounds); SET_USB_BUFFER_UINT8(0, UsbStatusCode_ReadConfig_BufferOutOfBounds);
return; return;
} }

7
right/src/usb_commands/usb_command_read_config.h
View File

@@ -5,4 +5,11 @@
void UsbCommand_ReadConfig(bool isHardware); void UsbCommand_ReadConfig(bool isHardware);
// Typedefs:
typedef enum {
UsbStatusCode_ReadConfig_LengthTooLarge = 2,
UsbStatusCode_ReadConfig_BufferOutOfBounds = 3,
} usb_status_code_read_config_t;
#endif #endif

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

@@ -9,7 +9,7 @@ void UsbCommand_WriteConfig(bool isHardware)
uint16_t offset = GET_USB_BUFFER_UINT16(2); uint16_t offset = GET_USB_BUFFER_UINT16(2);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-4) { if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-4) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_LengthTooLarge); SET_USB_BUFFER_UINT8(0, UsbStatusCode_WriteConfig_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) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_BufferOutOfBounds); SET_USB_BUFFER_UINT8(0, UsbStatusCode_WriteConfig_BufferOutOfBounds);
return; return;
} }

7
right/src/usb_commands/usb_command_write_config.h
View File

@@ -5,4 +5,11 @@
void UsbCommand_WriteConfig(bool isHardware); void UsbCommand_WriteConfig(bool isHardware);
// Typedefs:
typedef enum {
UsbStatusCode_WriteConfig_LengthTooLarge = 2,
UsbStatusCode_WriteConfig_BufferOutOfBounds = 3,
} usb_status_code_write_config_t;
#endif #endif

5
right/src/usb_protocol_handler.h
View File

@@ -41,11 +41,6 @@
UsbStatusCode_InvalidCommand = 1, UsbStatusCode_InvalidCommand = 1,
} usb_status_code_general_t; } usb_status_code_general_t;
typedef enum {
UsbStatusCode_TransferConfig_LengthTooLarge = 2,
UsbStatusCode_TransferConfig_BufferOutOfBounds = 3,
} usb_status_code_transfer_config_t;
// Functions: // Functions:
void UsbProtocolHandler(void); void UsbProtocolHandler(void);