For the hal_flash API's make the change to uintptr_t to support 64-bi…

…t explicit using `ARCH_64BIT` or known 64-bit architectures.
wolfSSL · Aug 4, 2023 · 77ba9cf · 77ba9cf
1 parent c3056c8
commit 77ba9cf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/hal/nxp_t2080.c b/hal/nxp_t2080.c
@@ -532,7 +532,7 @@ void hal_init(void)
 #endif
 }
 
-int hal_flash_write(uintptr_t address, const uint8_t *data, int len)
+int hal_flash_write(uint32_t address, const uint8_t *data, int len)
 {
     (void)address;
     (void)data;
@@ -541,7 +541,7 @@ int hal_flash_write(uintptr_t address, const uint8_t *data, int len)
     return 0;
 }
 
-int hal_flash_erase(uintptr_t address, int len)
+int hal_flash_erase(uint32_t address, int len)
 {
     (void)address;
     (void)len;

diff --git a/include/hal.h b/include/hal.h
@@ -46,12 +46,15 @@ void hal_deinit();
 #endif
 
 void hal_init(void);
-#if !defined(FORCE_32BIT) && INTPTR_MAX == INT64_MAX /* 64-bit platform */
-int hal_flash_write(uintptr_t address, const uint8_t *data, int len);
-int hal_flash_erase(uintptr_t address, int len);
+#if defined(ARCH_64BIT) || \
+    defined(ARCH_x86_64) || defined(ARCH_AARCH64) || defined(ARCH_SIM)
+    /* 64-bit platforms */
+    int hal_flash_write(uintptr_t address, const uint8_t *data, int len);
+    int hal_flash_erase(uintptr_t address, int len);
 #else
-int hal_flash_write(uint32_t address, const uint8_t *data, int len);
-int hal_flash_erase(uint32_t address, int len);
+    /* original 32-bit */
+    int hal_flash_write(uint32_t address, const uint8_t *data, int len);
+    int hal_flash_erase(uint32_t address, int len);
 #endif
 void hal_flash_unlock(void);
 void hal_flash_lock(void);