Removed duplicate reset code

Used ASF reset code to avoid duplication Added some missing externs
kuro68k · Oct 22, 2015 · 3a133ff · 3a133ff
1 parent 15658a5
commit 3a133ff
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 68 deletions.
diff --git a/firmware/hid_bootloader/eeprom.h b/firmware/hid_bootloader/eeprom.h
@@ -53,10 +53,10 @@ inline static void EEP_WaitForNVM(void)
 /**************************************************************************************************
 ** Externally accessible functions
 */
-void EEP_WaitForNVM( void );
-void EEP_LoadPageBuffer(const uint8_t *data, uint8_t size)	__attribute__((nonnull));
-void EEP_AtomicWritePage(uint8_t page_addr);
-void EEP_EraseAll( void );
+extern void EEP_WaitForNVM(void);
+extern void EEP_LoadPageBuffer(const uint8_t *data, uint8_t size)	__attribute__((nonnull));
+extern void EEP_AtomicWritePage(uint8_t page_addr);
+extern void EEP_EraseAll(void);
 
 
 

diff --git a/firmware/hid_bootloader/hid_bootloader.c b/firmware/hid_bootloader/hid_bootloader.c
@@ -13,7 +13,6 @@
 #include <asf.h>
 #include "eeprom.h"
 #include "sp_driver.h"
-#include "misc_asm.h"
 #include "protocol.h"
 
 #define BOOTLOADER_VERSION	1
@@ -233,7 +232,7 @@ void HID_set_feature_report_out(uint8_t *report)
 			break;
 
 		case CMD_RESET_MCU:
-			reset_mcu();
+			reset_do_soft_reset();
 			response[1] = 0xFF;	// failed
 			break;
 

diff --git a/firmware/hid_bootloader/hid_bootloader.cproj b/firmware/hid_bootloader/hid_bootloader.cproj
@@ -303,12 +303,6 @@
     <None Include="src\asf.h">
       <SubType>compile</SubType>
     </None>
-    <Compile Include="misc_asm.h">
-      <SubType>compile</SubType>
-    </Compile>
-    <Compile Include="misc_asm.S">
-      <SubType>compile</SubType>
-    </Compile>
     <Compile Include="protocol.h">
       <SubType>compile</SubType>
     </Compile>

diff --git a/firmware/hid_bootloader/misc_asm.S b/firmware/hid_bootloader/misc_asm.S
diff --git a/firmware/hid_bootloader/misc_asm.h b/firmware/hid_bootloader/misc_asm.h