Fix address alignment check in EraseFlash (close #5)

fossasia · Dec 23, 2024 · 588a97e · 588a97e
1 parent 5e1616d
commit 588a97e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/mcc_generated_files/boot/boot_process.c b/src/mcc_generated_files/boot/boot_process.c
@@ -65,10 +65,6 @@ Copyright (c) [2012-2019] Microchip Technology Inc.
 
 #include "boot_config.h"
 
-#ifndef FLASH_ERASE_PAGE_MASK 
-#define FLASH_ERASE_PAGE_MASK  (~((FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS*2) - 1)) 
-#endif
-
 
 #if ((BOOT_CONFIG_MAX_PACKET_SIZE - SIZE_OF_CMD_STRUCT_0) < MINIMUM_WRITE_BLOCK_SIZE )
 #error "The maximum packet size is not large enough to store a full write block plus header. Make the max packet size larger."

diff --git a/src/mcc_generated_files/memory/flash.h b/src/mcc_generated_files/memory/flash.h
@@ -28,13 +28,13 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#define FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS 1024U
+#define FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS 1024UL
 
-#define FLASH_ERASE_PAGE_SIZE_IN_PC_UNITS  (FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS*2U)
+#define FLASH_ERASE_PAGE_SIZE_IN_PC_UNITS  (FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS*2UL)
 
 #define FLASH_UNLOCK_KEY 0x00AA0055
 
-#define FLASH_ERASE_PAGE_MASK (~((FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS*2U) - 1U)) 
+#define FLASH_ERASE_PAGE_MASK (~((FLASH_ERASE_PAGE_SIZE_IN_INSTRUCTIONS*2UL) - 1UL))
 void FLASH_Unlock(uint32_t key);
 void FLASH_Lock(void);