Michael Galis / nRF51822

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 639:abe58b2a2b5d, committed 2017-02-26

Comitter:
galism
Date:
Sun Feb 26 03:15:43 2017 +0000
Parent:
615:1751e2e2637a
Commit message:
No changes

Changed in this revision

source/nordic_sdk/components/libraries/fstorage/fstorage_config.h Show annotated file Show diff for this revision Revisions of this file 
--- a/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Tue Jan 12 19:58:03 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Sun Feb 26 03:15:43 2017 +0000
@@ -80,14 +80,23 @@
  * @note    If there is a bootloader present the bootloader address read from UICR
  *          will act as the page beyond the end of the available flash storage
  */
-static __INLINE uint32_t fs_flash_page_end_addr()
+/*static __INLINE uint32_t fs_flash_page_end_addr()
 {
     uint32_t const bootloader_addr = NRF_UICR->NRFFW[0];
     return  ((bootloader_addr != FS_EMPTY_MASK) ?
              bootloader_addr : NRF_FICR->CODESIZE * FS_PAGE_SIZE);
+}*/
+static __INLINE uint32_t fs_flash_page_end_addr()
+{
+#if 0
+    uint32_t const bootloader_addr = NRF_UICR->NRFFW[0];
+#else
+    uint32_t const bootloader_addr = NRF_UICR->BOOTLOADERADDR;
+#endif
+    return  ((bootloader_addr != FS_EMPTY_MASK) ?
+             bootloader_addr : NRF_FICR->CODESIZE * FS_PAGE_SIZE);
 }
 
-
 /**@brief Macro for last page address
  *
  * @note    If there is a bootloader present the bootloader address read from UICR