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

Extract UsbCommand_WriteConfig()

Browse Source
This commit is contained in:
László Monda
2017-11-04 08:43:27 +01:00
parent 232f595b41
commit 54496ca210
3 changed files with 36 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
right/src/usb_commands/usb_command_write_config.c Normal file
View File

@@ -0,0 +1,25 @@
#include "fsl_common.h"
#include "usb_commands/usb_command_write_config.h"
#include "usb_protocol_handler.h"
#include "eeprom.h"
void UsbCommand_WriteConfig(bool isHardware)
{
uint8_t length = GenericHidInBuffer[1];
uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1));
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1-1-2) {
SetUsbError(ConfigTransferResponse_LengthTooLarge);
return;
}
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : StagingUserConfigBuffer.buffer;
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
SetUsbError(ConfigTransferResponse_BufferOutOfBounds);
return;
}
memcpy(buffer+offset, GenericHidInBuffer+1+1+2, length);
}

8
right/src/usb_commands/usb_command_write_config.h Normal file
View File

@@ -0,0 +1,8 @@
#ifndef __USB_COMMAND_WRITE_CONFIG_H__
#define __USB_COMMAND_WRITE_CONFIG_H__
// Functions:
void UsbCommand_WriteConfig(bool isHardware);
#endif

26
right/src/usb_protocol_handler.c
View File

@@ -17,6 +17,7 @@
#include "i2c_watchdog.h"
#include "usb_commands/usb_command_apply_config.h"
#include "usb_commands/usb_command_read_config.h"
#include "usb_commands/usb_command_write_config.h"
#include "usb_commands/usb_command_get_property.h"
#include "usb_commands/usb_command_jump_to_slave_bootloader.h"
#include "usb_commands/usb_command_send_kboot_command.h"
@@ -94,27 +95,6 @@ void legacyLaunchEepromTransfer(void)
}
}
void writeConfiguration(bool isHardware)
{
uint8_t length = GenericHidInBuffer[1];
uint16_t offset = *((uint16_t*)(GenericHidInBuffer+1+1));
if (length > USB_GENERIC_HID_OUT_BUFFER_LENGTH-1-1-2) {
SetUsbError(ConfigTransferResponse_LengthTooLarge);
return;
}
uint8_t *buffer = isHardware ? HardwareConfigBuffer.buffer : StagingUserConfigBuffer.buffer;
uint16_t bufferLength = isHardware ? HARDWARE_CONFIG_SIZE : USER_CONFIG_SIZE;
if (offset + length > bufferLength) {
SetUsbError(ConfigTransferResponse_BufferOutOfBounds);
return;
}
memcpy(buffer+offset, GenericHidInBuffer+1+1+2, length);
}
void getKeyboardState(void)
{
GenericHidOutBuffer[1] = IsEepromBusy;
@@ -162,7 +142,7 @@ void UsbProtocolHandler(void)
readMergeSensor();
break;
case UsbCommandId_WriteUserConfiguration:
writeConfiguration(false);
UsbCommand_WriteConfig(false);
break;
case UsbCommandId_ApplyConfig:
UsbCommand_ApplyConfig();
@@ -180,7 +160,7 @@ void UsbProtocolHandler(void)
UsbCommand_ReadConfig(true);
break;
case UsbCommandId_WriteHardwareConfiguration:
writeConfiguration(true);
UsbCommand_WriteConfig(true);
break;
case UsbCommandId_ReadUserConfiguration:
UsbCommand_ReadConfig(false);