Return error from stm32f4_program

Now error code from stm32f4_program function has meaning and could be
send back to user.

Author: Chimstaz

Inc/communication/wakaama_client/objects/object_target.h

@@ -26,7 +26,7 @@ typedef struct _target_instance_
     uint32_t firmware_version;
     char * binary_filename;
     uint8_t download_progress;
-    uint8_t flash_error;
+    uint16_t flash_error;
     TARGET_t *target;
 } target_instance_t;
 

Inc/cortexm/stm32/stm32f4.h

@@ -42,6 +42,17 @@
 
 #define STM32F4_SIZE_OF_ONE_WRITE 0x1000
 
+/* 
+ * flash errors returned to flash_target_task
+ * 0x0 - 0x1000   - reserved for target (we can use this pool here)
+ * bit 9 (0x200)  - error while flash erasing. [8..0] represent FLASH_SR[8..0]
+ * bit 10 (0x400) - error while flash writing. [8..0] represent FLASH_SR[8..0]
+ */
+#define STM32F4_ERASE_ERROR_BIT            0x200
+#define STM32F4_FLASH_ERROR_BIT            0x400
+#define STM32F4_ERASE_NEVER_END            0x800
+#define STM32F4_ERROR_ON_FLASH_WRITE_SETUP 0x801
+
 typedef struct CORTEXM_s CORTEXM_t;
 
 typedef struct STM32F4_PRIV_s {

Inc/target.h

@@ -9,7 +9,9 @@
 #define FLASH_ERROR 2
 #define FLASH_COMPLETED 3
 
-#define USB_FS_ERROR 1
+// Flash Error status
+// 0x0 -- 0x1000 reserved for target
+#define USB_FS_ERROR 0x1001
 
 // TODO: define real functions with real arguments
 typedef struct TARGET_OPS_s {

Src/cortexm/stm32/stm32f4.c

@@ -69,7 +69,7 @@ static int stm32f4_erase_all_flash(STM32F4_PRIV_t *priv)
     if(priv->cortex->ops->check_error(priv->cortex->priv)) {
       // TODO: handle error
       printf("Error while waiting for erase end\n");
-      return 1;
+      return STM32F4_ERASE_NEVER_END;
     }
   }
 
@@ -78,7 +78,7 @@ static int stm32f4_erase_all_flash(STM32F4_PRIV_t *priv)
   if ((sr & STM32F4_SR_ERROR_MASK) || !(sr & STM32F4_SR_EOP)) {
     // TODO: handle error
     printf("Error after erase 0x%x\n", sr);
-    return 1;
+    return sr | STM32F4_ERASE_ERROR_BIT;
   }
   return 0;
 }
@@ -100,7 +100,7 @@ static int stm32f4_flash_write(STM32F4_PRIV_t *priv, uint32_t dest, const uint32
   if(priv->cortex->ops->check_error(priv->cortex->priv)) {
     // TODO: handle error
     printf("ERROR: Filed to setup write operation\n");
-    return 1;
+    return STM32F4_ERROR_ON_FLASH_WRITE_SETUP;
   }
 
   /* Execute the stub */
@@ -115,7 +115,7 @@ static int stm32f4_flash_write(STM32F4_PRIV_t *priv, uint32_t dest, const uint32
   if (sr & STM32F4_SR_ERROR_MASK) {
     // TODO: handle error
     printf("ERROR: writing ended with error 0x%x\n", sr);
-    return 1;
+    return sr | STM32F4_FLASH_ERROR_BIT;
   }
 
   return 0;
@@ -128,14 +128,16 @@ static int stm32f4_program(void *priv_void, FIL *file)
   uint32_t addr = 0x8000000; // start of flash memory
   uint32_t *data = pvPortMalloc(STM32F4_SIZE_OF_ONE_WRITE/sizeof(uint32_t));
   STM32F4_PRIV_t *priv = priv_void;
+  uint16_t result;
 
   printf("Start flashing STM32F4x\n");
 
   priv->cortex->ops->halt_request(priv->cortex->priv);
   stm32f4_flash_unlock(priv);
-  if(stm32f4_erase_all_flash(priv)) {
+  result = stm32f4_erase_all_flash(priv);
+  if(result) {
     vPortFree(data);
-    return 1;
+    return result;
   }
 
   do {
@@ -151,15 +153,17 @@ static int stm32f4_program(void *priv_void, FIL *file)
       // add modified bytes to bytes that will be written
       br++;
       br <<= 2;
-      if(stm32f4_flash_write(priv, addr, data, br)) {
+      result = stm32f4_flash_write(priv, addr, data, br);
+      if(result) {
         vPortFree(data);
-        return 1;
+        return result;
       }
       // Unaligned read is always smaller then SIZE_OF_ONE_WRITE.
       // This is EOF so we have done here.
       break;
     }
-    if(stm32f4_flash_write(priv, addr, data, br)) {
+    result = stm32f4_flash_write(priv, addr, data, br);
+    if(result) {
       vPortFree(data);
       return 1;
     }