From e907e657518bb7e2b637d666d05a58ec31312377 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Sun, 5 Nov 2017 01:18:37 +0100
Subject: [PATCH] Extract UsbCommand_Reenumerate() into its own file.

---
 right/src/usb_commands/usb_command_reenumerate.c | 12 ++++++++++++
 right/src/usb_commands/usb_command_reenumerate.h |  8 ++++++++
 right/src/usb_protocol_handler.c                 | 11 ++---------
 3 files changed, 22 insertions(+), 9 deletions(-)
 create mode 100644 right/src/usb_commands/usb_command_reenumerate.c
 create mode 100644 right/src/usb_commands/usb_command_reenumerate.h

diff --git a/right/src/usb_commands/usb_command_reenumerate.c b/right/src/usb_commands/usb_command_reenumerate.c
new file mode 100644
index 0000000..0e57097
--- /dev/null
+++ b/right/src/usb_commands/usb_command_reenumerate.c
@@ -0,0 +1,12 @@
+#include "fsl_common.h"
+#include "usb_commands/usb_command_reenumerate.h"
+#include "usb_protocol_handler.h"
+#include "bootloader/wormhole.h"
+
+void UsbCommand_Reenumerate(void)
+{
+    Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;
+    Wormhole.enumerationMode = GenericHidInBuffer[1];
+    Wormhole.timeoutMs = *((uint32_t*)(GenericHidInBuffer+2));
+    NVIC_SystemReset();
+}
diff --git a/right/src/usb_commands/usb_command_reenumerate.h b/right/src/usb_commands/usb_command_reenumerate.h
new file mode 100644
index 0000000..fccefd3
--- /dev/null
+++ b/right/src/usb_commands/usb_command_reenumerate.h
@@ -0,0 +1,8 @@
+#ifndef __USB_COMMAND_REENUMERATE_H__
+#define __USB_COMMAND_REENUMERATE_H__
+
+// Functions:
+
+    void UsbCommand_Reenumerate(void);
+
+#endif
diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index 8872605..82169ad 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -24,6 +24,7 @@
 #include "usb_commands/usb_command_launch_eeprom_transfer_legacy.h"
 #include "usb_commands/usb_command_get_keyboard_state.h"
 #include "usb_commands/usb_command_get_debug_info.h"
+#include "usb_commands/usb_command_reenumerate.h"
 
 uint8_t UsbDebugInfo[USB_GENERIC_HID_OUT_BUFFER_LENGTH];
 
@@ -46,14 +47,6 @@ void SetUsbResponseWord(uint16_t response)
 
 // Per command protocol command handlers
 
-void reenumerate(void)
-{
-    Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER;
-    Wormhole.enumerationMode = GenericHidInBuffer[1];
-    Wormhole.timeoutMs = *((uint32_t*)(GenericHidInBuffer+2));
-    NVIC_SystemReset();
-}
-
 void setTestLed(void)
 {
     uint8_t ledState = GenericHidInBuffer[1];
@@ -90,7 +83,7 @@ void UsbProtocolHandler(void)
             UsbCommand_GetProperty();
             break;
         case UsbCommandId_Reenumerate:
-            reenumerate();
+            UsbCommand_Reenumerate();
             break;
         case UsbCommandId_SetTestLed:
             setTestLed();