flash: add get start flash region

Plus fixes in the tests to get properly end of flash (start + size)

Author: 0xc0170

TESTS/mbed_drivers/flashiap/main.cpp

@@ -43,7 +43,7 @@ void flashiap_program_test()
     TEST_ASSERT_EQUAL_INT32(ret, 0);
 
     // get the last sector size (flash size - 1)
-    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_size() - 1UL);
+    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_start() + flash_device.get_flash_size() - 1UL);
     TEST_ASSERT_NOT_EQUAL(sector_size, 0);
     const uint8_t test_value = 0xCE;
     uint8_t *data = new uint8_t[sector_size];
@@ -52,7 +52,7 @@ void flashiap_program_test()
     }
 
     // the one before the last page in the system
-    uint32_t address = (flash_device.get_flash_size()) - (sector_size);
+    uint32_t address = (flash_device.get_flash_start() + flash_device.get_flash_size()) - (sector_size);
     TEST_ASSERT_TRUE(address != 0UL);
     ret = flash_device.erase(address, sector_size);
     TEST_ASSERT_EQUAL_INT32(ret, 0);
@@ -78,7 +78,7 @@ void flashiap_write_test()
     TEST_ASSERT_EQUAL_INT32(ret, 0);
 
     // get the last sector size
-    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_size() - 1UL);
+    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_start() + flash_device.get_flash_size() - 1UL);
     TEST_ASSERT_NOT_EQUAL(sector_size, 0);
     const uint8_t test_value = 0xCE;
     uint8_t *data = new uint8_t[sector_size];
@@ -87,7 +87,7 @@ void flashiap_write_test()
     }
 
     // the one before the last page in the system
-    uint32_t address = (flash_device.get_flash_size()) - (sector_size);
+    uint32_t address = (flash_device.get_flash_start() + flash_device.get_flash_size()) - (sector_size);
     TEST_ASSERT_TRUE(address != 0UL);
     ret = flash_device.write(data, address, sector_size);
     TEST_ASSERT_EQUAL_INT32(ret, 0);
@@ -110,7 +110,7 @@ void flashiap_program_error_test()
     TEST_ASSERT_EQUAL_INT32(ret, 0);
 
     // get the last sector size (flash size - 1)
-    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_size() - 1UL);
+    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_start() + flash_device.get_flash_size() - 1UL);
     TEST_ASSERT_NOT_EQUAL(sector_size, 0);
     const uint8_t test_value = 0xCE;
     uint8_t *data = new uint8_t[sector_size];
@@ -119,7 +119,7 @@ void flashiap_program_error_test()
     }
 
     // the one before the last page in the system
-    uint32_t address = (flash_device.get_flash_size()) - (sector_size);
+    uint32_t address = (flash_device.get_flash_start() + flash_device.get_flash_size()) - (sector_size);
     TEST_ASSERT_TRUE(address != 0UL);
 
     // unaligned address
@@ -147,7 +147,7 @@ void flashiap_write_error_test()
     TEST_ASSERT_EQUAL_INT32(ret, 0);
 
     // get the last sector size
-    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_size() - 1UL);
+    uint32_t sector_size = flash_device.get_sector_size(flash_device.get_flash_start() + flash_device.get_flash_size() - 1UL);
     TEST_ASSERT_NOT_EQUAL(sector_size, 0);
     const uint8_t test_value = 0xCE;
     uint8_t *data = new uint8_t[sector_size];
@@ -156,7 +156,7 @@ void flashiap_write_error_test()
     }
 
     // the one before the last page in the system
-    uint32_t address = (flash_device.get_flash_size()) - (sector_size);
+    uint32_t address = (flash_device.get_flash_start() + flash_device.get_flash_size()) - (sector_size);
     TEST_ASSERT_TRUE(address != 0UL);
 
     // unaligned address

TESTS/mbed_hal/flash/functional_tests/main.cpp

@@ -60,7 +60,7 @@ void flash_program_page_test()
     }
 
     // the one before the last page in the system
-    uint32_t address = (test_flash.target_config->flash_start + test_flash.target_config->flash_size) - (2*test_size);
+    uint32_t address = flash_get_start_address(&test_flash) + flash_get_size(&test_flash) - (2*test_size);
 
     // sector size might not be same as page size
     uint32_t erase_sector_boundary = ALIGN_DOWN(address, flash_get_sector_size(&test_flash, address));
@@ -97,7 +97,7 @@ void flash_erase_sector_test()
     TEST_ASSERT_EQUAL_INT32(ret, 0);
 
     uint32_t sector_size = 0x1000;
-    uint32_t address = (test_flash.target_config->flash_start + test_flash.target_config->flash_size) - (4*sector_size);
+    uint32_t address = flash_get_start_address(&test_flash) + flash_get_size(&test_flash) - (4*sector_size);
     // sector size might not be same as page size
     uint32_t erase_sector_boundary = ALIGN_DOWN(address, flash_get_sector_size(&test_flash, address));
     ret = flash_erase_sector(&test_flash, erase_sector_boundary);
@@ -115,7 +115,7 @@ void flash_erase_sector_error_test()
 
     // most common sector size to get an sector address 
     uint32_t sector_size = 0x1000;
-    uint32_t address = (test_flash.target_config->flash_start + test_flash.target_config->flash_size) - (4*sector_size);
+    uint32_t address = flash_get_start_address(&test_flash) + flash_get_size(&test_flash) - (4*sector_size);
     uint32_t erase_sector_boundary = ALIGN_DOWN(address, flash_get_sector_size(&test_flash, address));
 
     // unaligned address
@@ -136,7 +136,7 @@ void flash_program_page_error_test()
 
     uint32_t test_size = flash_get_page_size(&test_flash);
     // the one before the last page in the system
-    uint32_t address = (test_flash.target_config->flash_start + test_flash.target_config->flash_size) - (2*test_size);
+    uint32_t address = flash_get_start_address(&test_flash) + flash_get_size(&test_flash) - (2*test_size);
 
     // sector size might not be same as page size
     uint32_t erase_sector_boundary = ALIGN_DOWN(address, flash_get_sector_size(&test_flash, address));

drivers/FlashIAP.cpp

@@ -165,6 +165,11 @@ uint32_t FlashIAP::get_sector_size(uint32_t addr) const
     return flash_get_sector_size(&_flash, addr);
 }
 
+uint32_t FlashIAP::get_flash_start() const
+{
+    return flash_get_start_address(&_flash);
+}
+
 uint32_t FlashIAP::get_flash_size() const
 {
     return flash_get_size(&_flash);

drivers/FlashIAP.h

@@ -107,9 +107,15 @@ class FlashIAP {
      */
     uint32_t get_sector_size(uint32_t addr) const;
 
-    /** Get the total size of the underlying device
+    /** Get the flash start address 
      *
-     *  @return Size of the underlying device in bytes
+     *  @return Flash start address 
+     */
+    uint32_t get_flash_start() const;
+
+    /** Get the flash size
+     *
+     *  @return Flash size 
      */
     uint32_t get_flash_size() const;
 

hal/TARGET_FLASH_CMSIS_ALGO/flash_common_algo.c

@@ -161,6 +161,11 @@ uint32_t flash_get_page_size(const flash_t *obj)
     return obj->target_config->page_size;
 }
 
+uint32_t flash_get_start_address(const flash_t *obj)
+{
+    return obj->target_config->flash_start;
+}
+
 uint32_t flash_get_size(const flash_t *obj)
 {
     return obj->target_config->flash_size;

hal/flash_api.h

@@ -90,10 +90,17 @@ uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address);
  */
 uint32_t flash_get_page_size(const flash_t *obj);
 
-/** Get flash size
+/** Get start address for the flash region
  * 
  * @param obj The flash objects
- * @return The size of the flash available
+ * @return The start address for the flash region
+ */
+uint32_t flash_get_start_address(const flash_t *obj);
+
+/** Get the flash region size
+ * 
+ * @param obj The flash objects
+ * @return The flash region size
  */
 uint32_t flash_get_size(const flash_t *obj);