Implement erease slot OSAL API to avoid using gecko bootloader platform calls in TLVs

Author: ismilak

osal/efr32_wisun/osal_efr32_wisun.c

@@ -635,7 +635,7 @@ osal_basetype_t osal_write_storage(osal_slotid_t slotid,
   }
 
   ret = bootloader_writeStorage(__slotid2gblslotid(slotid), offset, data, len);
-  
+
   if (ret != BOOTLOADER_OK) {
     DPRINTF("write_storage: bootloader_writeStorage failed\n");
     return OSAL_FAILURE;
@@ -644,6 +644,22 @@ osal_basetype_t osal_write_storage(osal_slotid_t slotid,
   return OSAL_SUCCESS;
 }
 
+osal_basetype_t osal_erase_storaqe(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)
+{
+  int32_t ret = 0l;
+
+  if (slot == NULL) { 
+    return OSAL_FAILURE;
+  }
+
+  ret = bootloader_eraseStorageSlot(__slotid2gblslotid(slotid));
+
+  if (ret != BOOTLOADER_OK) {
+    return OSAL_FAILURE;
+  }
+
+  return OSAL_SUCCESS;
+}
 
 osal_basetype_t osal_deploy_and_reboot_firmware(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)
 {

osal/freertos/osal_freertos.c

@@ -530,14 +530,21 @@ osal_basetype_t osal_write_storage(osal_slotid_t slotid,
   uint8_t *data, 
   uint32_t len)
 {
-(void) slotid;
-if (slot == NULL || data == NULL || !len) {
-return OSAL_FAILURE;
-}
+  (void) slotid;
+  if (slot == NULL || data == NULL || !len) {
+  return OSAL_FAILURE;
+  }
 
-(void) memcpy(&slot->image[offset], data, len);
+  (void) memcpy(&slot->image[offset], data, len);
+
+  return OSAL_SUCCESS;
+}
 
-return OSAL_SUCCESS;
+osal_basetype_t osal_erase_storaqe(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)
+{
+  (void) slotid;
+  (void) slot;
+  return OSAL_SUCCESS;
 }
 
 osal_basetype_t osal_deploy_and_reboot_firmware(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)

osal/linux/osal_linux.c

@@ -515,6 +515,12 @@ osal_basetype_t osal_write_storage(osal_slotid_t slotid,
   return OSAL_SUCCESS;
 }
 
+osal_basetype_t osal_erase_storaqe(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)
+{
+  (void) slotid;
+  (void) slot;
+  return OSAL_SUCCESS;
+}
 
 osal_basetype_t osal_deploy_and_reboot_firmware(osal_slotid_t slotid, osal_csmp_slothdr_t *slot)
 {

osal/osal.h

@@ -611,11 +611,11 @@ osal_basetype_t osal_write_firmware_slothdr(osal_slotid_t slotid, osal_csmp_slot
 /****************************************************************************
  * @fn   osal_write_storage
  * @brief write data to the storage
- * @param[in] slotid slot id
- * @param[in] slot slot structure
- * @param[in] offset offset to write
- * @param[in] data data to write
- * @param[in] len length of data
+ *  @param[in] slotid slot id
+ *  @param[in] slot slot structure
+ *  @param[in] offset offset to write
+ *  @param[in] data data to write
+ *  @param[in] len length of data
  * @return returns 0 on success and -1 on error
  *****************************************************************************/
 osal_basetype_t osal_write_storage(osal_slotid_t slotid, 
@@ -624,6 +624,19 @@ osal_basetype_t osal_write_storage(osal_slotid_t slotid,
                                    uint8_t *data, 
                                    uint32_t len);
 
+
+/****************************************************************************
+ * @fn osal_erase_storage
+ *
+ * @brief Erase storage.
+ *
+ *  @param[in] slotid Slot ID.
+ *  @param[in] slot Pointer to slot structure.
+ *
+ * @return Returns 0 on success and -1 on error.
+ *****************************************************************************/
+osal_basetype_t osal_erase_storaqe(osal_slotid_t slotid, osal_csmp_slothdr_t *slot);
+
 /****************************************************************************
  * @fn   osal_deploy_and_reboot_firmware
  *

sample/tlvs/efr32_wisun_tlvs.c

@@ -28,8 +28,6 @@
 #include "sl_wisun_app_core.h"
 #include "../../src/lib/debug.h"
 
-#include "btl_interface.h"
-
 #define nexthop_IP "fe80::a00:27ff:fe3b:2ab1"
 
 
@@ -687,8 +685,8 @@ void transferRequest_post(tlvid_t tlvid, Transfer_Request *tlv) {
   // Initiliase new transfer - done
   g_initxfer = false;
 
-  DPRINTF("Erasing gecko bootloader 'UPLOAD' storage slot...\n");
-  assert(bootloader_eraseStorageSlot(GECKO_BTL_UPLOAD_SLOT_ID) == BOOTLOADER_OK);
+  DPRINTF("Erasing 'UPLOAD' storage slot...\n");
+  assert(osal_erase_storaqe(UPLOAD_IMAGE, &g_slothdr[UPLOAD_IMAGE]) == OSAL_SUCCESS);
 
   DPRINTF("## sample_firmwaremgmt: POST for TLV %ld done.\n", tlvid.type);
 }

sample/tlvs/freertos_tlvs.c

@@ -679,6 +679,9 @@ void transferRequest_post(tlvid_t tlvid, Transfer_Request *tlv) {
   // Initiliase new transfer - done
   g_initxfer = false;
 
+  DPRINTF("Erasing 'UPLOAD' storage slot...\n");
+  assert(osal_erase_storaqe(UPLOAD_IMAGE, &g_slothdr[UPLOAD_IMAGE]) == OSAL_SUCCESS);
+  
   DPRINTF("## sample_firmwaremgmt: POST for TLV %d done.\n", tlvid.type);
 }
 

sample/tlvs/linux_tlvs.c

@@ -739,6 +739,9 @@ void transferRequest_post(tlvid_t tlvid, Transfer_Request *tlv) {
   // Initiliase new transfer - done
   g_initxfer = false;
 
+  DPRINTF("Erasing 'UPLOAD' storage slot...\n");
+  assert(osal_erase_storaqe(UPLOAD_IMAGE, &g_slothdr[UPLOAD_IMAGE]) == OSAL_SUCCESS);
+
   DPRINTF("## sample_firmwaremgmt: POST for TLV %d done.\n", tlvid.type);
 }
 
@@ -848,7 +851,7 @@ void imageBlock_post(tlvid_t tlvid, Image_Block *tlv) {
     }
 
     osal_basetype_t ret = OSAL_FAILURE;
-    
+
     // Write image block to slot at valid offset
     if (offset < OSAL_CSMP_FWMGMT_SLOTIMG_SIZE &&
        ((offset + g_imageBlock.blockdata.len) < OSAL_CSMP_FWMGMT_SLOTIMG_SIZE)) {