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

Add USB_STATUS_CODE_SIZE and use it to kill the magic numbers of usb_command_read_config()

Browse Source
This commit is contained in:
László Monda
2017-11-06 00:44:32 +01:00
parent 003f313947
commit 9910fe536f
2 changed files with 4 additions and 2 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

@@ -8,7 +8,7 @@ void UsbCommand_ReadConfig(bool isHardware)
uint8_t length = GET_USB_BUFFER_UINT8(1);
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 - USB_STATUS_CODE_SIZE) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_ReadConfig_LengthTooLarge);
return;
}
@@ -21,5 +21,5 @@ void UsbCommand_ReadConfig(bool isHardware)
return;
}
memcpy(GenericHidOutBuffer+1, buffer+offset, length);
memcpy(GenericHidOutBuffer + USB_STATUS_CODE_SIZE, buffer + offset, length);
}

2
right/src/usb_protocol_handler.h
View File

@@ -8,6 +8,8 @@
// Macros:
#define USB_STATUS_CODE_SIZE 1
#define GET_USB_BUFFER_UINT8(offset) (*(uint8_t*)(GenericHidInBuffer+(offset)))
#define GET_USB_BUFFER_UINT16(offset) (*(uint16_t*)(GenericHidInBuffer+(offset)))
#define GET_USB_BUFFER_UINT32(offset) (*(uint32_t*)(GenericHidInBuffer+(offset)))