From 54496ca2105850a2b9f10d540b7f398afcb9a15a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Sat, 4 Nov 2017 08:43:27 +0100
Subject: [PATCH] Extract UsbCommand_WriteConfig()

---
 .../usb_commands/usb_command_write_config.c   | 25 ++++++++++++++++++
 .../usb_commands/usb_command_write_config.h   |  8 ++++++
 right/src/usb_protocol_handler.c              | 26 +++----------------
 3 files changed, 36 insertions(+), 23 deletions(-)
 create mode 100644 right/src/usb_commands/usb_command_write_config.c
 create mode 100644 right/src/usb_commands/usb_command_write_config.h

diff --git a/right/src/usb_commands/usb_command_write_config.c b/right/src/usb_commands/usb_command_write_config.c
new file mode 100644
index 0000000..5ae6eef
--- /dev/null
+++ b/right/src/usb_commands/usb_command_write_config.c
@@ -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);
+}
diff --git a/right/src/usb_commands/usb_command_write_config.h b/right/src/usb_commands/usb_command_write_config.h
new file mode 100644
index 0000000..4ae039e
--- /dev/null
+++ b/right/src/usb_commands/usb_command_write_config.h
@@ -0,0 +1,8 @@
+#ifndef __USB_COMMAND_WRITE_CONFIG_H__
+#define __USB_COMMAND_WRITE_CONFIG_H__
+
+// Functions:
+
+    void UsbCommand_WriteConfig(bool isHardware);
+
+#endif
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index f5dc994..33afdeb 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -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);