S Classen / nRF51822

fork of Nordic nRF51822 library

Fork of nRF51822 by Nordic Semiconductor

Files at this revision

API Documentation at this revision

Revision 638:f822ec741b45, committed 2016-08-13

Comitter:
sclassen
Date:
Sat Aug 13 01:20:53 2016 +0000
Parent:
615:1751e2e2637a
Commit message:
bug 272: increase sensitivity of tap for exiting low power mode

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 1751e2e2637a -r f822ec741b45 source/nordic_sdk/components/libraries/fstorage/fstorage_config.h
--- 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	Sat Aug 13 01:20:53 2016 +0000
@@ -82,7 +82,12 @@
  */
 static __INLINE uint32_t fs_flash_page_end_addr()
 {
+// sc: refer to https://developer.mbed.org/questions/68259/nRF51822-library-not-compiling/
+#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);
 }