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

NRF52: spi_api: port from Softdevice 14.2 to 15.0

pull/10652/head
Naveen Kaje 2018-08-14 13:39:42 -05:00 committed by desmond.chen
parent a1d5a4d973
commit 4f9782dfeb
4 changed files with 79 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52832/config/sdk_config.h
View File

@ -2921,7 +2921,7 @@
// <e> NRFX_RNG_ENABLED - nrfx_rng - RNG peripheral driver // <e> NRFX_RNG_ENABLED - nrfx_rng - RNG peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_RNG_ENABLED #ifndef NRFX_RNG_ENABLED
#define NRFX_RNG_ENABLED 1 #define NRFX_RNG_ENABLED 0
#endif #endif
// <q> NRFX_RNG_CONFIG_ERROR_CORRECTION - Error correction // <q> NRFX_RNG_CONFIG_ERROR_CORRECTION - Error correction
@ -3221,27 +3221,27 @@
// <e> NRFX_SPIM_ENABLED - nrfx_spim - SPIM peripheral driver // <e> NRFX_SPIM_ENABLED - nrfx_spim - SPIM peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_SPIM_ENABLED #ifndef NRFX_SPIM_ENABLED
#define NRFX_SPIM_ENABLED 1 #define NRFX_SPIM_ENABLED 0
#endif #endif
// <q> NRFX_SPIM0_ENABLED - Enable SPIM0 instance // <q> NRFX_SPIM0_ENABLED - Enable SPIM0 instance
#ifndef NRFX_SPIM0_ENABLED #ifndef NRFX_SPIM0_ENABLED
#define NRFX_SPIM0_ENABLED 1 #define NRFX_SPIM0_ENABLED 0
#endif #endif
// <q> NRFX_SPIM1_ENABLED - Enable SPIM1 instance // <q> NRFX_SPIM1_ENABLED - Enable SPIM1 instance
#ifndef NRFX_SPIM1_ENABLED #ifndef NRFX_SPIM1_ENABLED
#define NRFX_SPIM1_ENABLED 1 #define NRFX_SPIM1_ENABLED 0
#endif #endif
// <q> NRFX_SPIM2_ENABLED - Enable SPIM2 instance // <q> NRFX_SPIM2_ENABLED - Enable SPIM2 instance
#ifndef NRFX_SPIM2_ENABLED #ifndef NRFX_SPIM2_ENABLED
#define NRFX_SPIM2_ENABLED 1 #define NRFX_SPIM2_ENABLED 0
#endif #endif
// <q> NRFX_SPIM3_ENABLED - Enable SPIM3 instance // <q> NRFX_SPIM3_ENABLED - Enable SPIM3 instance
@ -3454,7 +3454,7 @@
#ifndef NRFX_SPI0_ENABLED #ifndef NRFX_SPI0_ENABLED
#define NRFX_SPI0_ENABLED 0 #define NRFX_SPI0_ENABLED 1
#endif #endif
// <q> NRFX_SPI1_ENABLED - Enable SPI1 instance // <q> NRFX_SPI1_ENABLED - Enable SPI1 instance
@ -3468,7 +3468,7 @@
#ifndef NRFX_SPI2_ENABLED #ifndef NRFX_SPI2_ENABLED
#define NRFX_SPI2_ENABLED 0 #define NRFX_SPI2_ENABLED 1
#endif #endif
// <o> NRFX_SPI_MISO_PULL_CFG - MISO pin pull configuration. // <o> NRFX_SPI_MISO_PULL_CFG - MISO pin pull configuration.

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

@ -3221,27 +3221,27 @@
// <e> NRFX_SPIM_ENABLED - nrfx_spim - SPIM peripheral driver // <e> NRFX_SPIM_ENABLED - nrfx_spim - SPIM peripheral driver
//========================================================== //==========================================================
#ifndef NRFX_SPIM_ENABLED #ifndef NRFX_SPIM_ENABLED
#define NRFX_SPIM_ENABLED 1 #define NRFX_SPIM_ENABLED 0
#endif #endif
// <q> NRFX_SPIM0_ENABLED - Enable SPIM0 instance // <q> NRFX_SPIM0_ENABLED - Enable SPIM0 instance
#ifndef NRFX_SPIM0_ENABLED #ifndef NRFX_SPIM0_ENABLED
#define NRFX_SPIM0_ENABLED 1 #define NRFX_SPIM0_ENABLED 0
#endif #endif
// <q> NRFX_SPIM1_ENABLED - Enable SPIM1 instance // <q> NRFX_SPIM1_ENABLED - Enable SPIM1 instance
#ifndef NRFX_SPIM1_ENABLED #ifndef NRFX_SPIM1_ENABLED
#define NRFX_SPIM1_ENABLED 1 #define NRFX_SPIM1_ENABLED 0
#endif #endif
// <q> NRFX_SPIM2_ENABLED - Enable SPIM2 instance // <q> NRFX_SPIM2_ENABLED - Enable SPIM2 instance
#ifndef NRFX_SPIM2_ENABLED #ifndef NRFX_SPIM2_ENABLED
#define NRFX_SPIM2_ENABLED 1 #define NRFX_SPIM2_ENABLED 0
#endif #endif
// <q> NRFX_SPIM3_ENABLED - Enable SPIM3 instance // <q> NRFX_SPIM3_ENABLED - Enable SPIM3 instance
@ -3454,7 +3454,7 @@
#ifndef NRFX_SPI0_ENABLED #ifndef NRFX_SPI0_ENABLED
#define NRFX_SPI0_ENABLED 0 #define NRFX_SPI0_ENABLED 1
#endif #endif
// <q> NRFX_SPI1_ENABLED - Enable SPI1 instance // <q> NRFX_SPI1_ENABLED - Enable SPI1 instance
@ -3468,7 +3468,7 @@
#ifndef NRFX_SPI2_ENABLED #ifndef NRFX_SPI2_ENABLED
#define NRFX_SPI2_ENABLED 0 #define NRFX_SPI2_ENABLED 1
#endif #endif
// <o> NRFX_SPI_MISO_PULL_CFG - MISO pin pull configuration. // <o> NRFX_SPI_MISO_PULL_CFG - MISO pin pull configuration.

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

@ -43,7 +43,7 @@
#include "PortNames.h" #include "PortNames.h"
#include "PeripheralNames.h" #include "PeripheralNames.h"
#include "PinNames.h" #include "PinNames.h"
#include "nrf_drv_spi.h" #include "nrfx_spi.h"
#include "nrf_twi.h" #include "nrf_twi.h"
#include "nrf_pwm.h" #include "nrf_pwm.h"
@ -90,7 +90,7 @@ struct serial_s {
struct spi_s { struct spi_s {
int instance; int instance;
PinName cs; PinName cs;
nrf_drv_spi_config_t config; nrfx_spi_config_t config;
bool update; bool update;
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH

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

@ -46,11 +46,17 @@
#include "nrfx_spi.h" #include "nrfx_spi.h"
#if 0
#define DEBUG_PRINTF(...) printf(__VA_ARGS__)
#else
#define DEBUG_PRINTF(...)
#endif
/* Pre-allocate instances and share them globally. */ /* Pre-allocate instances and share them globally. */
static const nrf_drv_spi_t nordic_nrf5_spi_instance[3] = { static const nrfx_spi_t nordic_nrf5_spi_instance[3] = {
NRF_DRV_SPI_INSTANCE(0), NRFX_SPI_INSTANCE(0),
NRF_DRV_SPI_INSTANCE(1), NRFX_SPI_INSTANCE(1),
NRF_DRV_SPI_INSTANCE(2) NRFX_SPI_INSTANCE(2)
}; };
/* Keep track of which instance has been initialized. */ /* Keep track of which instance has been initialized. */
@ -58,7 +64,7 @@ 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(nrfx_spi_evt_t const *p_event, void *p_context);
#endif #endif
/* Forward declaration. These functions are implemented in the driver but not /* Forward declaration. These functions are implemented in the driver but not
@ -99,7 +105,7 @@ static void spi_configure_driver_instance(spi_t *obj)
/* Clean up and uninitialize peripheral if already initialized. */ /* Clean up and uninitialize peripheral if already initialized. */
if (nordic_nrf5_spi_initialized[instance]) { if (nordic_nrf5_spi_initialized[instance]) {
nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]); nrfx_spi_uninit(&nordic_nrf5_spi_instance[instance]);
} }
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
@ -141,7 +147,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
/* Get instance based on requested pins. */ /* Get instance based on requested pins. */
spi_inst->instance = pin_instance_spi(mosi, miso, sclk); spi_inst->instance = pin_instance_spi(mosi, miso, sclk);
MBED_ASSERT(spi_inst->instance < ENABLED_SPI_COUNT); MBED_ASSERT(spi_inst->instance < NRFX_SPI_ENABLED_COUNT);
/* Store chip select separately for manual enabling. */ /* Store chip select separately for manual enabling. */
spi_inst->cs = ssel; spi_inst->cs = ssel;
@ -150,14 +156,14 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
spi_inst->config.sck_pin = sclk; spi_inst->config.sck_pin = sclk;
spi_inst->config.mosi_pin = mosi; spi_inst->config.mosi_pin = mosi;
spi_inst->config.miso_pin = miso; spi_inst->config.miso_pin = miso;
spi_inst->config.ss_pin = NRF_DRV_SPI_PIN_NOT_USED; spi_inst->config.ss_pin = NRFX_SPI_PIN_NOT_USED;
/* Use the default config. */ /* Use the default config. */
spi_inst->config.irq_priority = SPI_DEFAULT_CONFIG_IRQ_PRIORITY; spi_inst->config.irq_priority = SPI_DEFAULT_CONFIG_IRQ_PRIORITY;
spi_inst->config.orc = SPI_FILL_CHAR; spi_inst->config.orc = SPI_FILL_CHAR;
spi_inst->config.frequency = NRF_DRV_SPI_FREQ_1M; spi_inst->config.frequency = NRF_SPI_FREQ_4M;
spi_inst->config.mode = NRF_DRV_SPI_MODE_0; spi_inst->config.mode = NRF_SPI_MODE_0;
spi_inst->config.bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST; spi_inst->config.bit_order = NRF_SPI_BIT_ORDER_MSB_FIRST;
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
/* Set default values for asynchronous variables. */ /* Set default values for asynchronous variables. */
@ -210,7 +216,7 @@ void spi_free(spi_t *obj)
int instance = spi_inst->instance; int instance = spi_inst->instance;
/* Use driver uninit to free instance. */ /* Use driver uninit to free instance. */
nrf_drv_spi_uninit(&nordic_nrf5_spi_instance[instance]); nrfx_spi_uninit(&nordic_nrf5_spi_instance[instance]);
/* Mark instance as uninitialized. */ /* Mark instance as uninitialized. */
nordic_nrf5_spi_initialized[instance] = false; nordic_nrf5_spi_initialized[instance] = false;
@ -238,17 +244,17 @@ void spi_format(spi_t *obj, int bits, int mode, int slave)
struct spi_s *spi_inst = obj; struct spi_s *spi_inst = obj;
#endif #endif
nrf_drv_spi_mode_t new_mode = NRF_DRV_SPI_MODE_0; nrf_spi_mode_t new_mode = NRF_SPI_MODE_0;
/* Convert Mbed HAL mode to Nordic mode. */ /* Convert Mbed HAL mode to Nordic mode. */
if(mode == 0) { if(mode == 0) {
new_mode = NRF_DRV_SPI_MODE_0; new_mode = NRF_SPI_MODE_0;
} else if(mode == 1) { } else if(mode == 1) {
new_mode = NRF_DRV_SPI_MODE_1; new_mode = NRF_SPI_MODE_1;
} else if(mode == 2) { } else if(mode == 2) {
new_mode = NRF_DRV_SPI_MODE_2; new_mode = NRF_SPI_MODE_2;
} else if(mode == 3) { } else if(mode == 3) {
new_mode = NRF_DRV_SPI_MODE_3; new_mode = NRF_SPI_MODE_3;
} }
/* Check if configuration has changed. */ /* Check if configuration has changed. */
@ -280,23 +286,23 @@ void spi_frequency(spi_t *obj, int hz)
struct spi_s *spi_inst = obj; struct spi_s *spi_inst = obj;
#endif #endif
nrf_drv_spi_frequency_t new_frequency = NRF_DRV_SPI_FREQ_1M; nrf_spi_frequency_t new_frequency = NRF_SPI_FREQ_1M;
/* Convert frequency to Nordic enum type. */ /* Convert frequency to Nordic enum type. */
if (hz < 250000) { if (hz < 250000) {
new_frequency = NRF_DRV_SPI_FREQ_125K; new_frequency = NRF_SPI_FREQ_125K;
} else if (hz < 500000) { } else if (hz < 500000) {
new_frequency = NRF_DRV_SPI_FREQ_250K; new_frequency = NRF_SPI_FREQ_250K;
} else if (hz < 1000000) { } else if (hz < 1000000) {
new_frequency = NRF_DRV_SPI_FREQ_500K; new_frequency = NRF_SPI_FREQ_500K;
} else if (hz < 2000000) { } else if (hz < 2000000) {
new_frequency = NRF_DRV_SPI_FREQ_1M; new_frequency = NRF_SPI_FREQ_1M;
} else if (hz < 4000000) { } else if (hz < 4000000) {
new_frequency = NRF_DRV_SPI_FREQ_2M; new_frequency = NRF_SPI_FREQ_2M;
} else if (hz < 8000000) { } else if (hz < 8000000) {
new_frequency = NRF_DRV_SPI_FREQ_4M; new_frequency = NRF_SPI_FREQ_4M;
} else { } else {
new_frequency = NRF_DRV_SPI_FREQ_8M; new_frequency = NRF_SPI_FREQ_8M;
} }
/* Check if configuration has changed. */ /* Check if configuration has changed. */
@ -316,6 +322,8 @@ void spi_frequency(spi_t *obj, int hz)
*/ */
int spi_master_write(spi_t *obj, int value) int spi_master_write(spi_t *obj, int value)
{ {
nrfx_err_t ret;
nrfx_spi_xfer_desc_t desc;
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
struct spi_s *spi_inst = &obj->spi; struct spi_s *spi_inst = &obj->spi;
#else #else
@ -337,7 +345,14 @@ int spi_master_write(spi_t *obj, int value)
} }
/* Transfer 1 byte. */ /* Transfer 1 byte. */
nrf_drv_spi_transfer(&nordic_nrf5_spi_instance[instance], &tx_buff, 1, &rx_buff, 1); desc.p_tx_buffer = &tx_buff;
desc.p_rx_buffer = &rx_buff;
desc.tx_length = 1;
desc.rx_length = 1;
ret = nrfx_spi_xfer(&nordic_nrf5_spi_instance[instance], &desc, 0);
if (ret != NRFX_SUCCESS)
DEBUG_PRINTF("%d error returned from nrf_spi_xfer\n\r");
/* Manually set chip select pin if defined. */ /* Manually set chip select pin if defined. */
if (spi_inst->cs != NC) { if (spi_inst->cs != NC) {
@ -365,6 +380,7 @@ int spi_master_write(spi_t *obj, int value)
*/ */
int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, char write_fill) int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, char *rx_buffer, int rx_length, char write_fill)
{ {
nrfx_spi_xfer_desc_t desc;
#if DEVICE_SPI_ASYNCH #if DEVICE_SPI_ASYNCH
struct spi_s *spi_inst = &obj->spi; struct spi_s *spi_inst = &obj->spi;
#else #else
@ -396,10 +412,10 @@ int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, cha
int tx_offset = 0; int tx_offset = 0;
int rx_offset = 0; int rx_offset = 0;
ret_code_t result = NRF_SUCCESS; ret_code_t result = NRFX_SUCCESS;
/* Loop until all data is sent and received. */ /* Loop until all data is sent and received. */
while (((tx_length > 0) || (rx_length > 0)) && (result == NRF_SUCCESS)) { while (((tx_length > 0) || (rx_length > 0)) && (result == NRFX_SUCCESS)) {
/* Check if tx_length is larger than 255 and if so, limit to 255. */ /* Check if tx_length is larger than 255 and if so, limit to 255. */
int tx_actual_length = (tx_length > 255) ? 255 : tx_length; int tx_actual_length = (tx_length > 255) ? 255 : tx_length;
@ -418,11 +434,12 @@ int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, cha
NULL; NULL;
/* Blocking transfer. */ /* Blocking transfer. */
result = nrf_drv_spi_transfer(&nordic_nrf5_spi_instance[instance], desc.p_tx_buffer = tx_actual_buffer;
tx_actual_buffer, desc.p_rx_buffer = rx_actual_buffer;
tx_actual_length, desc.tx_length = tx_actual_length;
rx_actual_buffer, desc.rx_length = rx_actual_length;
rx_actual_length); result = nrfx_spi_xfer(&nordic_nrf5_spi_instance[instance],
&desc, 0);
/* Update loop variables. */ /* Update loop variables. */
tx_length -= tx_actual_length; tx_length -= tx_actual_length;
@ -558,6 +575,7 @@ void spi_slave_write(spi_t *obj, int value)
static ret_code_t spi_master_transfer_async_continue(spi_t *obj) static ret_code_t spi_master_transfer_async_continue(spi_t *obj)
{ {
nrfx_spi_xfer_desc_t desc;
/* Remaining data to be transferred. */ /* Remaining data to be transferred. */
size_t tx_length = obj->tx_buff.length - obj->tx_buff.pos; size_t tx_length = obj->tx_buff.length - obj->tx_buff.pos;
size_t rx_length = obj->rx_buff.length - obj->rx_buff.pos; size_t rx_length = obj->rx_buff.length - obj->rx_buff.pos;
@ -572,17 +590,18 @@ static ret_code_t spi_master_transfer_async_continue(spi_t *obj)
rx_length = 255; rx_length = 255;
} }
ret_code_t result = nrf_drv_spi_transfer(&nordic_nrf5_spi_instance[obj->spi.instance], desc.p_tx_buffer = ((const uint8_t *)(obj->tx_buff.buffer) + obj->tx_buff.pos);
((const uint8_t *)(obj->tx_buff.buffer) + obj->tx_buff.pos), desc.p_rx_buffer = ((uint8_t *)(obj->rx_buff.buffer) + obj->rx_buff.pos);
tx_length, desc.tx_length = tx_length;
((uint8_t *)(obj->rx_buff.buffer) + obj->rx_buff.pos), desc.rx_length = rx_length;
rx_length);
ret_code_t result = nrfx_spi_xfer(&nordic_nrf5_spi_instance[obj->spi.instance],
&desc, 0);
return result; return result;
} }
/* Callback function for driver calls. This is called from ISR context. */ /* Callback function for driver calls. This is called from ISR context. */
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(nrfx_spi_evt_t const *p_event, void *p_context)
{ {
// Only safe to use with mbed-printf. // Only safe to use with mbed-printf.
//DEBUG_PRINTF("nordic_nrf5_twi_event_handler: %d %p\r\n", p_event->type, p_context); //DEBUG_PRINTF("nordic_nrf5_twi_event_handler: %d %p\r\n", p_event->type, p_context);
@ -593,11 +612,11 @@ static void nordic_nrf5_spi_event_handler(nrf_drv_spi_evt_t const *p_event, void
spi_t *obj = (spi_t *) p_context; spi_t *obj = (spi_t *) p_context;
struct spi_s *spi_inst = &obj->spi; struct spi_s *spi_inst = &obj->spi;
if (p_event->type == NRF_DRV_SPI_EVENT_DONE) { if (p_event->type == NRFX_SPI_EVENT_DONE) {
/* Update buffers with new positions. */ /* Update buffers with new positions. */
obj->tx_buff.pos += p_event->data.done.tx_length; obj->tx_buff.pos += p_event->xfer_desc.tx_length;
obj->rx_buff.pos += p_event->data.done.rx_length; obj->rx_buff.pos += p_event->xfer_desc.rx_length;
/* Setup a new transfer if more data is pending. */ /* Setup a new transfer if more data is pending. */
if ((obj->tx_buff.pos < obj->tx_buff.length) || (obj->rx_buff.pos < obj->tx_buff.length)) { if ((obj->tx_buff.pos < obj->tx_buff.length) || (obj->rx_buff.pos < obj->tx_buff.length)) {
@ -606,7 +625,7 @@ static void nordic_nrf5_spi_event_handler(nrf_drv_spi_evt_t const *p_event, void
ret_code_t result = spi_master_transfer_async_continue(obj); ret_code_t result = spi_master_transfer_async_continue(obj);
/* Abort if transfer wasn't accepted. */ /* Abort if transfer wasn't accepted. */
if (result != NRF_SUCCESS) { if (result != NRFX_SUCCESS) {
/* Signal callback handler that transfer failed. */ /* Signal callback handler that transfer failed. */
signal_error = true; signal_error = true;
@ -736,7 +755,7 @@ void spi_master_transfer(spi_t *obj,
ret_code_t result = spi_master_transfer_async_continue(obj); ret_code_t result = spi_master_transfer_async_continue(obj);
/* Signal error if event mask matches and event handler is set. */ /* Signal error if event mask matches and event handler is set. */
if ((result != NRF_SUCCESS) && (mask & SPI_EVENT_ERROR) && handler) { if ((result != NRFX_SUCCESS) && (mask & SPI_EVENT_ERROR) && handler) {
/* Cast handler to callback function pointer. */ /* Cast handler to callback function pointer. */
void (*callback)(void) = (void (*)(void)) handler; void (*callback)(void) = (void (*)(void)) handler;
@ -792,7 +811,7 @@ void spi_abort_asynch(spi_t *obj)
int instance = obj->spi.instance; int instance = obj->spi.instance;
/* Abort transfer. */ /* Abort transfer. */
nrf_drv_spi_abort(&nordic_nrf5_spi_instance[instance]); nrfx_spi_abort(&nordic_nrf5_spi_instance[instance]);
/* Force reconfiguration. */ /* Force reconfiguration. */
object_owner_spi2c_set(instance, NULL); object_owner_spi2c_set(instance, NULL);