X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Bootloader%2Fflash.c;h=742cf663ea44f1cf932c8248a683ca3d2b45108a;hb=a848a6bc79285a2e5b3705f126c36e5c5037d5ef;hp=349a44e3a052160bb24c3684b0a04afb45a323ab;hpb=02b919a4cb1bed022b5a09e9e03e29cda2b5a660;p=kiibohd-controller.git

diff --git a/Bootloader/flash.c b/Bootloader/flash.c
index 349a44e..742cf66 100644
--- a/Bootloader/flash.c
+++ b/Bootloader/flash.c
@@ -18,6 +18,7 @@
 // ----- Local Includes -----
 
 #include "mchck.h"
+#include "debug.h"
 
 
 
@@ -73,6 +74,13 @@ int flash_read_1s_sector( uintptr_t addr, size_t num )
 
 int flash_erase_sector( uintptr_t addr )
 {
+#ifdef FLASH_DEBUG
+	// Debug
+	print("Erasing Sector: address(");
+	printHex( addr );
+	printNL(")");
+#endif
+
 	if ( addr < (uintptr_t)&_app_rom && flash_ALLOW_BRICKABLE_ADDRESSES != 0x00023420 )
 		return (-1);
 	FTFL.fccob.erase.fcmd = FTFL_FCMD_ERASE_SECTOR;
@@ -83,6 +91,15 @@ int flash_erase_sector( uintptr_t addr )
 
 int flash_program_section_longwords( uintptr_t addr, size_t num_words )
 {
+#ifdef FLASH_DEBUG
+	// Debug
+	print("Programming Sector: address(");
+	printHex( addr );
+	print(") longwords(");
+	printHex( num_words );
+	printNL(")");
+#endif
+
 	FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
 	FTFL.fccob.program_section.addr = addr;
 	FTFL.fccob.program_section.num_words = num_words;
@@ -92,6 +109,15 @@ int flash_program_section_longwords( uintptr_t addr, size_t num_words )
 
 int flash_program_section_phrases( uintptr_t addr, size_t num_phrases )
 {
+#ifdef FLASH_DEBUG
+	// Debug
+	print("Programming Sector: address(");
+	printHex( addr );
+	print(") phrases(");
+	printHex( num_phrases );
+	printNL(")");
+#endif
+
 	FTFL.fccob.program_section.fcmd = FTFL_FCMD_PROGRAM_SECTION;
 	FTFL.fccob.program_section.addr = addr;
 	FTFL.fccob.program_section.num_words = num_phrases;
@@ -101,15 +127,20 @@ int flash_program_section_phrases( uintptr_t addr, size_t num_phrases )
 
 int flash_program_sector( uintptr_t addr, size_t len )
 {
-#if defined(_mk20dx128vlf5_)
-	return (len != FLASH_SECTOR_SIZE
-		|| (addr & (FLASH_SECTOR_SIZE - 1)) != 0
-		|| flash_erase_sector( addr )
-		|| flash_program_section_longwords( addr, FLASH_SECTOR_SIZE / 4 ));
-#elif defined(_mk20dx256vlh7_)
-	if ( len != FLASH_SECTOR_SIZE )
+	if ( len != USB_DFU_TRANSFER_SIZE )
 		return 1;
 
+#if defined(_mk20dx128vlf5_)
+	// Check if this is the beginning of a sector
+	// Only erase if necessary
+	if ( (addr & (FLASH_SECTOR_SIZE - 1)) == 0
+		&& flash_read_1s_sector( addr, FLASH_SECTOR_SIZE / 4 )
+		&& flash_erase_sector( addr ) )
+			return 1;
+
+	// Program sector
+	return flash_program_section_longwords( addr, FLASH_SECTOR_SIZE / 4 );
+#elif defined(_mk20dx256vlh7_)
 	// Check if beginning of sector and erase if not empty
 	// Each sector is 2 kB in length, but we can only write to half a sector at a time
 	// We can only erase an entire sector at a time
@@ -135,7 +166,7 @@ int flash_read_sector( uintptr_t addr, size_t len )
 
 void *flash_get_staging_area( uintptr_t addr, size_t len )
 {
-	if ( (addr & (FLASH_SECTOR_SIZE - 1)) != 0 || len != FLASH_SECTOR_SIZE )
+	if ( (addr & (USB_DFU_TRANSFER_SIZE - 1)) != 0 || len != USB_DFU_TRANSFER_SIZE )
 		return (NULL);
 	return (FlexRAM);
 }