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

Fix detection of enabled SPIM

pull/13397/head
winneymj 2020-08-15 08:02:49 -05:00
parent 6dbeece347
commit 21c928e6e5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/objects.h
View File

@ -43,9 +43,9 @@
#include "PortNames.h" #include "PortNames.h"
#include "PeripheralNames.h" #include "PeripheralNames.h"
#include "PinNames.h" #include "PinNames.h"
#if NRFX_SPIM_ENABLED == 1 || defined(DEVICE_SPIM) #if NRFX_SPIM_ENABLED || defined(DEVICE_SPIM)
#include "nrfx_spim.h" #include "nrfx_spim.h"
#elif NRFX_SPI_ENABLED == 1 || defined(DEVICE_SPI) #elif NRFX_SPI_ENABLED || defined(DEVICE_SPI)
#include "nrfx_spi.h" #include "nrfx_spi.h"
#endif #endif
#include "nrf_twi.h" #include "nrf_twi.h"
@ -94,9 +94,9 @@ struct serial_s {
struct spi_s { struct spi_s {
int instance; int instance;
PinName cs; PinName cs;
#if NRFX_SPIM_ENABLED == 1 || defined(DEVICE_SPIM) #if NRFX_SPIM_ENABLED || defined(DEVICE_SPIM)
nrfx_spim_config_t config; nrfx_spim_config_t config;
#elif NRFX_SPI_ENABLED == 1 || defined(DEVICE_SPI) #elif NRFX_SPI_ENABLED || defined(DEVICE_SPI)
nrfx_spi_config_t config; nrfx_spi_config_t config;
#endif #endif
bool update; bool update;