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 #7280 from marcuschangarm/fix-spi 

Fix SPI initialization for NRF52 series
pull/7299/head
Cruz Monrreal 2018-06-21 10:05:54 -05:00 committed by GitHub
parent 1087c0a959 6cec180d0b
commit b80490d884
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/spi_api.c
View File

@ -52,6 +52,9 @@ static const nrf_drv_spi_t nordic_nrf5_spi_instance[3] = {
NRF_DRV_SPI_INSTANCE(2) NRF_DRV_SPI_INSTANCE(2)
}; };
/* Keep track of which instance has been initialized. */
static bool nordic_nrf5_spi_initialized[3] = { false, false, false };
/* Forware declare interrupt handler. */ /* Forware declare interrupt handler. */
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
static void nordic_nrf5_spi_event_handler(nrf_drv_spi_evt_t const *p_event, void *p_context); static void nordic_nrf5_spi_event_handler(nrf_drv_spi_evt_t const *p_event, void *p_context);
@ -93,8 +96,10 @@ static void spi_configure_driver_instance(spi_t *obj)
/* Update applied, reset flag. */ /* Update applied, reset flag. */
spi_inst->update = false; spi_inst->update = false;
/* clean up and initialize peripheral. */ /* Clean up and uninitialize peripheral if already initialized. */
nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]); if (nordic_nrf5_spi_initialized[instance]) {
nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]);
}
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
/* Set callback handler in asynchronous mode. */ /* Set callback handler in asynchronous mode. */
@ -107,6 +112,10 @@ static void spi_configure_driver_instance(spi_t *obj)
/* Set callback handler to NULL in synchronous mode. */ /* Set callback handler to NULL in synchronous mode. */
nrf_drv_spi_init(&nordic_nrf5_spi_instance[instance], &(spi_inst->config), NULL, NULL); nrf_drv_spi_init(&nordic_nrf5_spi_instance[instance], &(spi_inst->config), NULL, NULL);
#endif #endif
/* Mark instance as initialized. */
nordic_nrf5_spi_initialized[instance] = true;
/* Claim ownership of peripheral. */ /* Claim ownership of peripheral. */
object_owner_spi2c_set(instance, obj); object_owner_spi2c_set(instance, obj);
} }
@ -201,6 +210,9 @@ void spi_free(spi_t *obj)
/* Use driver uninit to free instance. */ /* Use driver uninit to free instance. */
nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]); nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]);
/* Mark instance as uninitialized. */
nordic_nrf5_spi_initialized[instance] = false;
} }
/** Configure the SPI format /** Configure the SPI format