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

Merge pull request #4509 from kegilbert/17q2-spi_sdcard-rebase2 

NRF52840: enabled SdBlockDevice capability
pull/4470/head
Martin Kojtal 2017-06-09 15:07:03 +01:00 committed by GitHub
parent a59a319483 f324647aae
commit e850355a16
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52840/sdk/sdk_config.h
View File

@ -1962,7 +1962,7 @@
#ifndef SPI0_USE_EASY_DMA
#define SPI0_USE_EASY_DMA 1
#define SPI0_USE_EASY_DMA 0
#endif
// <o> SPI0_DEFAULT_FREQUENCY - SPI frequency
@ -1992,7 +1992,7 @@
#ifndef SPI1_USE_EASY_DMA
#define SPI1_USE_EASY_DMA 1
#define SPI1_USE_EASY_DMA 0
#endif
// <o> SPI1_DEFAULT_FREQUENCY - SPI frequency
@ -2022,7 +2022,7 @@
#ifndef SPI2_USE_EASY_DMA
#define SPI2_USE_EASY_DMA 1
#define SPI2_USE_EASY_DMA 0
#endif
// <q> SPI2_DEFAULT_FREQUENCY - Use EasyDMA

2
targets/TARGET_NORDIC/TARGET_NRF5/spi_api.c
View File

@ -141,11 +141,13 @@ static void master_event_handler(uint8_t spi_idx,
if (p_event->type == NRF_DRV_SPI_EVENT_DONE) {
p_spi_info->flag.busy = false;
#if DEVICE_SPI_ASYNCH
if (p_spi_info->handler) {
void (*handler)(void) = (void (*)(void))p_spi_info->handler;
p_spi_info->handler = 0;
handler();
}
#endif
}
}
#define MASTER_EVENT_HANDLER(idx) \

2
targets/targets.json
View File

@ -2829,7 +2829,7 @@
"supported_form_factors": ["ARDUINO"],
"inherits": ["MCU_NRF52840"],
"macros_add": ["BOARD_PCA10056", "CONFIG_GPIO_AS_PINRESET", "SWI_DISABLE0", "NRF52_ERRATA_20"],
"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", "TRNG"],
"device_has": ["FLASH", "ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "TRNG"],
"release_versions": ["2", "5"],
"device_name": "nRF52840_xxAA"
},