Skip to content

Commit 58e8881

Browse files
authored
Merge pull request #4282 from kl-cruz/FlashAPI_nRF52840
Flash api nRF52840
2 parents 049402c + 5cac624 commit 58e8881

File tree

4 files changed

+135
-16
lines changed

4 files changed

+135
-16
lines changed

TESTS/mbed_hal/flash/functional_tests/main.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
#include "mbed.h"
2626
#include "flash_api.h"
27-
#include "flash_data.h"
2827

2928
using namespace utest::v1;
3029

Lines changed: 117 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,117 @@
1+
/*
2+
* Copyright (c) 2017 Nordic Semiconductor ASA
3+
* All rights reserved.
4+
*
5+
* Redistribution and use in source and binary forms, with or without modification,
6+
* are permitted provided that the following conditions are met:
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice, this list
9+
* of conditions and the following disclaimer.
10+
*
11+
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12+
* integrated circuit in a product or a software update for such product, must reproduce
13+
* the above copyright notice, this list of conditions and the following disclaimer in
14+
* the documentation and/or other materials provided with the distribution.
15+
*
16+
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17+
* used to endorse or promote products derived from this software without specific prior
18+
* written permission.
19+
*
20+
* 4. This software, with or without modification, must only be used with a
21+
* Nordic Semiconductor ASA integrated circuit.
22+
*
23+
* 5. Any software provided in binary or object form under this license must not be reverse
24+
* engineered, decompiled, modified and/or disassembled.
25+
*
26+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
27+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
28+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
29+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
30+
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
31+
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
32+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
33+
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
34+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
35+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36+
*
37+
*/
38+
39+
#include "flash_api.h"
40+
#include "nrf_nvmc.h"
41+
#include "nrf_soc.h"
42+
#include "nrf_sdm.h"
43+
44+
#if DEVICE_FLASH
45+
46+
int32_t flash_init(flash_t *obj)
47+
{
48+
(void)(obj);
49+
uint8_t sd_enabled;
50+
if ((sd_softdevice_is_enabled(&sd_enabled) == NRF_SUCCESS) && sd_enabled == 1) {
51+
return -1;
52+
}
53+
return 0;
54+
}
55+
56+
int32_t flash_free(flash_t *obj)
57+
{
58+
(void)(obj);
59+
return 0;
60+
}
61+
62+
int32_t flash_erase_sector(flash_t *obj, uint32_t address)
63+
{
64+
(void)(obj);
65+
uint8_t sd_enabled;
66+
if ((sd_softdevice_is_enabled(&sd_enabled) == NRF_SUCCESS) && sd_enabled == 1) {
67+
return -1;
68+
}
69+
nrf_nvmc_page_erase(address);
70+
return 0;
71+
}
72+
73+
int32_t flash_program_page(flash_t *obj, uint32_t address, const uint8_t *data, uint32_t size)
74+
{
75+
uint8_t sd_enabled;
76+
if ((sd_softdevice_is_enabled(&sd_enabled) == NRF_SUCCESS) && sd_enabled == 1) {
77+
return -1;
78+
}
79+
/* We will use *_words function to speed up flashing code. Word means 32bit -> 4B
80+
* or sizeof(uint32_t).
81+
*/
82+
nrf_nvmc_write_words(address, (const uint32_t *) data, (size / sizeof(uint32_t)));
83+
return 0;
84+
}
85+
86+
uint32_t flash_get_size(const flash_t *obj)
87+
{
88+
(void)(obj);
89+
/* Just count flash size. */
90+
return NRF_FICR->CODESIZE * NRF_FICR->CODEPAGESIZE;
91+
}
92+
93+
uint32_t flash_get_sector_size(const flash_t *obj, uint32_t address)
94+
{
95+
(void)(obj);
96+
/* Test if passed address is in flash space. */
97+
if (address < flash_get_size(obj)) {
98+
return NRF_FICR->CODEPAGESIZE;
99+
}
100+
/* Something goes wrong, return invalid size error code. */
101+
return MBED_FLASH_INVALID_SIZE;
102+
}
103+
104+
uint32_t flash_get_page_size(const flash_t *obj)
105+
{
106+
(void)(obj);
107+
return NRF_FICR->CODEPAGESIZE;
108+
}
109+
110+
uint32_t flash_get_start_address(const flash_t *obj)
111+
{
112+
return 0;
113+
}
114+
115+
#endif
116+
117+
/** @}*/

targets/TARGET_NORDIC/TARGET_NRF5/objects.h

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
/*
1+
/*
22
* Copyright (c) 2013 Nordic Semiconductor ASA
33
* All rights reserved.
4-
*
4+
*
55
* Redistribution and use in source and binary forms, with or without modification,
66
* are permitted provided that the following conditions are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright notice, this list
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice, this list
99
* of conditions and the following disclaimer.
1010
*
11-
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12-
* integrated circuit in a product or a software update for such product, must reproduce
13-
* the above copyright notice, this list of conditions and the following disclaimer in
11+
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12+
* integrated circuit in a product or a software update for such product, must reproduce
13+
* the above copyright notice, this list of conditions and the following disclaimer in
1414
* the documentation and/or other materials provided with the distribution.
1515
*
16-
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17-
* used to endorse or promote products derived from this software without specific prior
16+
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17+
* used to endorse or promote products derived from this software without specific prior
1818
* written permission.
1919
*
20-
* 4. This software, with or without modification, must only be used with a
20+
* 4. This software, with or without modification, must only be used with a
2121
* Nordic Semiconductor ASA integrated circuit.
2222
*
23-
* 5. Any software provided in binary or object form under this license must not be reverse
24-
* engineered, decompiled, modified and/or disassembled.
25-
*
23+
* 5. Any software provided in binary or object form under this license must not be reverse
24+
* engineered, decompiled, modified and/or disassembled.
25+
*
2626
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2727
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -33,7 +33,7 @@
3333
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3434
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3535
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36-
*
36+
*
3737
*/
3838

3939
#ifndef MBED_OBJECTS_H
@@ -81,6 +81,9 @@ struct gpio_irq_s {
8181
uint32_t ch;
8282
};
8383

84+
struct flash_s {
85+
uint32_t placeholder;
86+
};
8487

8588
#include "gpio_object.h"
8689

targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2757,7 +2757,7 @@
27572757
"supported_form_factors": ["ARDUINO"],
27582758
"inherits": ["MCU_NRF52840"],
27592759
"macros_add": ["BOARD_PCA10056", "CONFIG_GPIO_AS_PINRESET", "SWI_DISABLE0", "NRF52_ERRATA_20"],
2760-
"device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
2760+
"device_has": ["FLASH", "ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"],
27612761
"release_versions": ["2", "5"],
27622762
"device_name": "nRF52840_xxAA"
27632763
},

0 commit comments

Comments
 (0)