ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mods for baseline 15.0 support

pull/10652/head
RFulchiero 2018-06-26 16:42:18 -05:00 committed by desmond.chen
parent 6bd89e7939
commit 511f8ebbd7
4 changed files with 8477 additions and 5243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13702
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h
View File

File diff suppressed because it is too large Load Diff

3
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/i2c_api.c
View File

@ -576,7 +576,8 @@ static void i2c_configure_driver_instance(i2c_t *obj)
config->mode = NORDIC_I2C_MODE_DRIVER;
/* If the peripheral is already running, then disable it and use the driver API to uninitialize it.*/
if (nordic_nrf5_instance[instance].reg.p_twi->ENABLE) {
// 15.0 - has additional "twi" structure level and had to rename to "u" from "reg"
if (nordic_nrf5_instance[instance].u.twi.p_twi->ENABLE) {
nrf_drv_twi_disable(&nordic_nrf5_instance[instance]);
nrf_drv_twi_uninit(&nordic_nrf5_instance[instance]);
}

9
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/serial_api.c
View File

@ -108,18 +108,9 @@
*/
typedef enum
{
NRF_UARTE_EVENT_RXDRDY = offsetof(NRF_UARTE_Type, EVENTS_RXDRDY),
NRF_UARTE_EVENT_TXDRDY = offsetof(NRF_UARTE_Type, EVENTS_TXDRDY),
} nrf_uarte_event_extra_t;
/**
* Missing interrupt masks.
*/
typedef enum
{
NRF_UARTE_INT_RXDRDY_MASK = UARTE_INTENSET_RXDRDY_Msk,
NRF_UARTE_INT_TXDRDY_MASK = UARTE_INTENSET_TXDRDY_Msk,
} nrf_uarte_int_mask_extra_t;
/**
* Internal struct for storing each UARTE instance's state:

6
targets/targets.json
View File

@ -7057,8 +7057,7 @@
"NORDIC",
"NRF5x",
"NRF52",
"SDK_14_2",
"NORDIC_SOFTDEVICE",
"SDK_15_0",
"SOFTDEVICE_COMMON",
"SOFTDEVICE_S132_FULL"
],
@ -7184,8 +7183,7 @@
"NORDIC",
"NRF5x",
"NRF52",
"SDK_14_2",
"NORDIC_SOFTDEVICE",
"SDK_15_0",
"SOFTDEVICE_COMMON",
"SOFTDEVICE_S140_FULL"
],