From 9910fe536fcac261b9310a25d8818ed4d3947c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 6 Nov 2017 00:44:32 +0100 Subject: [PATCH] Add USB_STATUS_CODE_SIZE and use it to kill the magic numbers of usb_command_read_config() --- right/src/usb_commands/usb_command_read_config.c | 4 ++-- right/src/usb_protocol_handler.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/right/src/usb_commands/usb_command_read_config.c b/right/src/usb_commands/usb_command_read_config.c index 8c88943..b2992c7 100644 --- a/right/src/usb_commands/usb_command_read_config.c +++ b/right/src/usb_commands/usb_command_read_config.c @@ -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); } diff --git a/right/src/usb_protocol_handler.h b/right/src/usb_protocol_handler.h index dbd50b5..2ccb423 100644 --- a/right/src/usb_protocol_handler.h +++ b/right/src/usb_protocol_handler.h @@ -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)))