nRF52840: Fixed flashapi test and casting issue

kl-cruz · kl-cruz · commit 4bb818cd97f7 · 2017-05-17T09:21:39.000+02:00
diff --git a/TESTS/mbed_hal/flash/functional_tests/main.cpp b/TESTS/mbed_hal/flash/functional_tests/main.cpp
@@ -24,7 +24,6 @@
 
 #include "mbed.h"
 #include "flash_api.h"
-#include "flash_data.h"
 
 using namespace utest::v1;
 
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/flash_api.c b/targets/TARGET_NORDIC/TARGET_NRF5_SDK13/flash_api.c
@@ -79,7 +79,7 @@ int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data,
     /* We will use *_words function to speed up flashing code. Word means 32bit -> 4B
      * or sizeof(uint32_t).
      */
-    nrf_nvmc_write_words(address, data, (size / sizeof(uint32_t)));
+    nrf_nvmc_write_words(address, (const uint32_t *) data, (size / sizeof(uint32_t)));
     return 0;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ int32_t flash_program_page(flash_t obj, uint32_t address, const uint8_t data,`
`79`	`79`	`/* We will use *_words function to speed up flashing code. Word means 32bit -> 4B`
`80`	`80`	`* or sizeof(uint32_t).`
`81`	`81`	`*/`
`82`		`- nrf_nvmc_write_words(address, data, (size / sizeof(uint32_t)));`
	`82`	`+ nrf_nvmc_write_words(address, (const uint32_t *) data, (size / sizeof(uint32_t)));`
`83`	`83`	`return 0;`
`84`	`84`	`}`
`85`	`85`