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

Add {GET,SET}_USB_BUFFER_UINT* and use them wherever possible. Get rid of SetUsb*() functions.

Browse Source
This commit is contained in:
László Monda
2017-11-05 22:09:34 +01:00
parent 58778feb5b
commit a8bde4e007
16 changed files with 64 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,11 +5,11 @@
void UsbCommand_WriteConfig(bool isHardware)
{
uint8_t length = GenericHidInBuffer[1];
uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1));
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-1-2) {
SetUsbStatusCode(UsbStatusCode_TransferConfig_LengthTooLarge);
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-4) {
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_LengthTooLarge);
return;
}
@@ -17,9 +17,9 @@ void UsbCommand_WriteConfig(bool isHardware)
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
SetUsbStatusCode(UsbStatusCode_TransferConfig_BufferOutOfBounds);
SET_USB_BUFFER_UINT8(0, UsbStatusCode_TransferConfig_BufferOutOfBounds);
return;
}
memcpy(buffer+offset, GenericHidInBuffer+1+1+2, length);
memcpy(buffer+offset, GenericHidInBuffer+4, length);
}