Toyomasa Watarai / 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:05ead4407322, committed 2016-08-18

Comitter:
MACRUM
Date:
Thu Aug 18 02:22:51 2016 +0000
Parent:
45:4a80ff6428ab
Commit message:
Minor fixes

Changed in this revision

source/nordic_sdk/components/libraries/fds/fds.c Show annotated file Show diff for this revision Revisions of this file
source/nordic_sdk/components/libraries/fstorage/fstorage.c Show annotated file Show diff for this revision Revisions of this file
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 05ead4407322 source/nordic_sdk/components/libraries/fds/fds.c
--- a/source/nordic_sdk/components/libraries/fds/fds.c	Mon Apr 11 16:13:57 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fds/fds.c	Thu Aug 18 02:22:51 2016 +0000
@@ -158,7 +158,7 @@
 {
     return (p_addr >= fs_config.p_start_addr) &&
            (p_addr <= fs_config.p_end_addr) &&
-           (is_word_aligned(p_addr));
+           (is_word_aligned((void *)p_addr));
 }
 
 
@@ -1088,7 +1088,7 @@
 {
     for (uint8_t i = 0; i < num_parts; i++)
     {
-        if (!is_word_aligned(p_chunk[i].p_data))
+        if (!is_word_aligned((void *)(p_chunk[i].p_data)))
         {
             return false;
         }

diff -r 4a80ff6428ab -r 05ead4407322 source/nordic_sdk/components/libraries/fstorage/fstorage.c
--- a/source/nordic_sdk/components/libraries/fstorage/fstorage.c	Mon Apr 11 16:13:57 2016 +0000
+++ b/source/nordic_sdk/components/libraries/fstorage/fstorage.c	Thu Aug 18 02:22:51 2016 +0000
@@ -466,7 +466,7 @@
         return NRF_ERROR_FORBIDDEN;
     }
 
-    if (!is_word_aligned(p_addr))
+    if (!is_word_aligned((void *)p_addr))
     {
         return NRF_ERROR_INVALID_ADDR;
     }

diff -r 4a80ff6428ab -r 05ead4407322 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	Thu Aug 18 02:22:51 2016 +0000
@@ -82,9 +82,10 @@
  */
 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);
+//    uint32_t const bootloader_addr = NRF_UICR->NRFFW[0];
+//    return  ((bootloader_addr != FS_EMPTY_MASK) ?
+//             bootloader_addr : NRF_FICR->CODESIZE * FS_PAGE_SIZE);
+	return 0;
 }