fmc: more error handling

Author: bkleiner

src/driver/fmc.h

@@ -24,6 +24,4 @@ void fmc_erase();
 
 flash_word_t fmc_read(uint32_t addr);
 void fmc_read_buf(uint32_t offset, uint8_t *data, uint32_t size);
-
-void fmc_write(uint32_t addr, flash_word_t value);
 void fmc_write_buf(uint32_t addr, uint8_t *data, uint32_t size);

src/driver/mcu/at32/fmc.c

@@ -1,5 +1,6 @@
 #include "driver/fmc.h"
 
+#include "core/failloop.h"
 #include "core/project.h"
 
 #define FLASH_PTR(offset) (_config_flash + FLASH_ALIGN(offset))
@@ -22,22 +23,27 @@ flash_word_t fmc_read(uint32_t addr) {
   return *((flash_word_t *)(_config_flash + addr));
 }
 
-void fmc_read_buf(uint32_t offset, uint8_t *data, uint32_t size) {
-  flash_word_t *ptr = (flash_word_t *)data;
+void fmc_read_buf(uint32_t start, uint8_t *data, uint32_t size) {
+  if (size < FLASH_WORD_SIZE || (size % FLASH_WORD_SIZE) || (start + size) > sizeof(_config_flash)) {
+    fmc_lock();
+    failloop(FAILLOOP_FAULT);
+  }
 
+  flash_word_t *ptr = (flash_word_t *)data;
   for (uint32_t i = 0; i < (size / sizeof(flash_word_t)); i++) {
-    ptr[i] = fmc_read(offset + i * sizeof(flash_word_t));
+    ptr[i] = fmc_read(start + i * sizeof(flash_word_t));
   }
 }
 
-void fmc_write(uint32_t addr, flash_word_t value) {
-  flash_word_program((uint32_t)FLASH_PTR(addr), value);
-}
+void fmc_write_buf(uint32_t start, uint8_t *data, uint32_t size) {
+  if (size < FLASH_WORD_SIZE || (size % FLASH_WORD_SIZE) || (start + size) > sizeof(_config_flash)) {
+    fmc_lock();
+    failloop(FAILLOOP_FAULT);
+  }
 
-void fmc_write_buf(uint32_t offset, uint8_t *data, uint32_t size) {
   flash_word_t *ptr = (flash_word_t *)data;
   for (uint32_t i = 0; i < (size / FLASH_WORD_SIZE); i++) {
-    const uint32_t addr = (uint32_t)FLASH_PTR(offset + i * FLASH_WORD_SIZE);
+    const uint32_t addr = (uint32_t)FLASH_PTR(start + i * FLASH_WORD_SIZE);
     flash_word_program(addr, ptr[i]);
   }
 }

src/driver/mcu/native/fmc.c

@@ -41,13 +41,6 @@ void fmc_read_buf(uint32_t addr, uint8_t *data, uint32_t size) {
   fclose(file);
 }
 
-void fmc_write(uint32_t addr, flash_word_t value) {
-  FILE *file = open_file();
-  fseek(file, addr, SEEK_SET);
-  fwrite(&value, sizeof(flash_word_t), 1, file);
-  fclose(file);
-}
-
 void fmc_write_buf(uint32_t addr, uint8_t *data, uint32_t size) {
   FILE *file = open_file();
   fseek(file, addr, SEEK_SET);

src/driver/mcu/stm32/fmc.c

@@ -55,33 +55,26 @@ flash_word_t fmc_read(uint32_t addr) {
   return *((flash_word_t *)(_config_flash + addr));
 }
 
-void fmc_read_buf(uint32_t offset, uint8_t *data, uint32_t size) {
-  flash_word_t *ptr = (flash_word_t *)data;
+void fmc_read_buf(uint32_t start, uint8_t *data, uint32_t size) {
+  if (size < FLASH_WORD_SIZE || (size % FLASH_WORD_SIZE) || (start + size) > sizeof(_config_flash)) {
+    fmc_lock();
+    failloop(FAILLOOP_FAULT);
+  }
 
+  flash_word_t *ptr = (flash_word_t *)data;
   for (uint32_t i = 0; i < (size / sizeof(flash_word_t)); i++) {
-    ptr[i] = fmc_read(offset + i * sizeof(flash_word_t));
+    ptr[i] = fmc_read(start + i * sizeof(flash_word_t));
   }
 }
 
-void fmc_write(uint32_t offset, flash_word_t value) {
-#ifdef STM32H7
-  uint8_t data[FLASH_WORD_SIZE];
-  memcpy(data, &value, sizeof(flash_word_t));
-
-  HAL_StatusTypeDef result = HAL_FLASH_Program(PROGRAM_TYPE, (uint32_t)FLASH_PTR(offset), (uint64_t)(uint32_t)(data));
-#else
-  HAL_StatusTypeDef result = HAL_FLASH_Program(PROGRAM_TYPE, (uint32_t)FLASH_PTR(offset), value);
-#endif
-
-  if (result != HAL_OK) {
+void fmc_write_buf(uint32_t start, uint8_t *data, uint32_t size) {
+  if (size < FLASH_WORD_SIZE || (size % FLASH_WORD_SIZE) || (start + size) > sizeof(_config_flash)) {
     fmc_lock();
     failloop(FAILLOOP_FAULT);
   }
-}
 
-void fmc_write_buf(uint32_t offset, uint8_t *data, uint32_t size) {
   for (uint32_t i = 0; i < (size / FLASH_WORD_SIZE); i++) {
-    const uint32_t addr = (uint32_t)FLASH_PTR(offset + i * FLASH_WORD_SIZE);
+    const uint32_t addr = (uint32_t)FLASH_PTR(start + i * FLASH_WORD_SIZE);
 
 #ifdef STM32H7
     const uint32_t ptr = (uint32_t)(data + i * FLASH_WORD_SIZE);