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

Fix bug in Nordic SDK 14.2 SPI driver
pull/6762/head
Cruz Monrreal 2018-04-26 20:17:36 -05:00 committed by GitHub
parent 9d6d8c7273 cba7e0df06
commit 487576972b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_14_2/drivers_nrf/spi_master/nrf_drv_spi.c
View File

@ -447,6 +447,15 @@ static void spi_xfer(NRF_SPI_Type * p_spi,
nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY); nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
/**
* 4/23/2018 Arm Mbed modification to Nordic SDK 14.2.
* Interrupts must be enabled before transmitting the first byte in asynchronous mode.
*/
if (p_cb->handler)
{
nrf_spi_int_enable(p_spi, NRF_SPI_INT_READY_MASK);
}
// Start the transfer by writing some byte to the TXD register; // Start the transfer by writing some byte to the TXD register;
// if TX buffer is not empty, take the first byte from this buffer, // if TX buffer is not empty, take the first byte from this buffer,
// otherwise - use over-run character. // otherwise - use over-run character.
@ -471,11 +480,11 @@ static void spi_xfer(NRF_SPI_Type * p_spi,
// and a new incoming byte was moved to the RXD register) and continue // and a new incoming byte was moved to the RXD register) and continue
// transaction until all requested bytes are transferred. // transaction until all requested bytes are transferred.
// In non-blocking mode - IRQ service routine will do this stuff. // In non-blocking mode - IRQ service routine will do this stuff.
if (p_cb->handler) /**
{ * 4/23/2018 Arm Mbed modification to Nordic SDK 14.2.
nrf_spi_int_enable(p_spi, NRF_SPI_INT_READY_MASK); * Interrupts must be enabled before transmitting the first byte in asynchronous mode.
} */
else if (p_cb->handler == NULL)
{ {
do { do {
while (!nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {} while (!nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {}