NagaChaitanya Vellanki / nrf51-sdk

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 nrf51-sdk by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 46:1da13bc089b1, committed 2016-07-25

Comitter:
chaitanyav
Date:
Mon Jul 25 16:50:05 2016 +0000
Parent:
45:4a80ff6428ab
Commit message:
Fix the compilation Struct "<unnamed>" has no field "NRFFW";

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 
diff -r 4a80ff6428ab -r 1da13bc089b1 source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
--- a/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Mon Apr 11 16:13:57 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fstorage/fstorage_config.h	Mon Jul 25 16:50:05 2016 +0000
@@ -62,11 +62,11 @@
 /**@brief Macro for flash page size according to chip family
  */
 #if defined (NRF51)
-    #define FS_PAGE_SIZE    (1024)
+#define FS_PAGE_SIZE    (1024)
 #elif defined (NRF52)
-    #define FS_PAGE_SIZE    (4096)
+#define FS_PAGE_SIZE    (4096)
 #else
-    #error "Device family must be defined. See nrf.h."
+#error "Device family must be defined. See nrf.h."
 #endif
 
 
@@ -82,7 +82,11 @@
  */
 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);
 }
@@ -100,11 +104,11 @@
  *
  */
 #if defined (NRF51)
-    #define FS_MAX_WRITE_SIZE_WORDS	    (256)
+#define FS_MAX_WRITE_SIZE_WORDS	    (256)
 #elif defined (NRF52)
-    #define FS_MAX_WRITE_SIZE_WORDS     (1024)
+#define FS_MAX_WRITE_SIZE_WORDS     (1024)
 #else
-    #error "Device family must be defined. see nrf.h"
+#error "Device family must be defined. see nrf.h"
 #endif
 
 /** @} */