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 #13681 from winneymj/nrf52840_SPIM3_Updates 

Nrf52840 spim3 updates
pull/13691/head
Martin Kojtal 2020-09-30 15:56:36 +01:00 committed by GitHub
parent aa9989f5bb d60af095ba
commit 05ea20c44a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/object_owners.c
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
#include "sdk_config.h"
#include "object_owners.h"
#include "nrf.h"
@ -22,9 +23,13 @@
#include <stdio.h>
#if NRFX_SPIM_ENABLED
#define SPI2C_INSTANCES SPIM_COUNT
#elif NRFX_SPI_ENABLED
#define SPI2C_INSTANCES SPI_COUNT
#endif
static void * nordic_spi2c_owners[SPI2C_INSTANCES] = { NULL, NULL, NULL };
static void * nordic_spi2c_owners[SPI2C_INSTANCES] = { NULL };
/**
* Brief Set instance owner for the SPI/I2C peripheral.

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

@ -480,11 +480,6 @@ void spi_frequency(spi_t *obj, int hz)
int spi_master_write(spi_t *obj, int value)
{
nrfx_err_t ret;
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
nrfx_spim_xfer_desc_t desc;
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
nrfx_spi_xfer_desc_t desc;
#endif
#if DEVICE_SPI_ASYNCH
struct spi_s *spi_inst = &obj->spi;
@ -507,18 +502,20 @@ int spi_master_write(spi_t *obj, int value)
}
/* Transfer 1 byte. */
desc.p_tx_buffer = &tx_buff;
desc.p_rx_buffer = &rx_buff;
desc.tx_length = 1;
desc.rx_length = 1;
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
nrfx_spim_xfer_desc_t desc = NRFX_SPIM_XFER_TRX(&tx_buff, 1, &rx_buff, 1);
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
nrfx_spi_xfer_desc_t desc = NRFX_SPI_XFER_TRX(&tx_buff, 1, &rx_buff, 1);
#endif
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
ret = nrfx_spim_xfer(&nordic_nrf5_spim_instance[instance], &desc, 0);
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
ret = nrfx_spi_xfer(&nordic_nrf5_spi_instance[instance], &desc, 0);
#endif
if (ret != NRFX_SUCCESS) {
DEBUG_PRINTF("%d error returned from nrf_spi_xfer\n\r");
DEBUG_PRINTF("%d error returned from nrf_spi_xfer\n\r", ret);
}
/* Manually set chip select pin if defined. */
@ -547,12 +544,6 @@ 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)
{
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
nrfx_spim_xfer_desc_t desc;
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
nrfx_spi_xfer_desc_t desc;
#endif
#if DEVICE_SPI_ASYNCH
struct spi_s *spi_inst = &obj->spi;
#else
@ -586,6 +577,10 @@ int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, cha
ret_code_t result = NRFX_SUCCESS;
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
nrfx_spim_xfer_desc_t desc = NRFX_SPIM_XFER_TRX(tx_buffer, tx_length, rx_buffer, rx_length);
result = nrfx_spim_xfer(&nordic_nrf5_spim_instance[instance], &desc, 0);
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
/* Loop until all data is sent and received. */
while (((tx_length > 0) || (rx_length > 0)) && (result == NRFX_SUCCESS)) {
@ -606,17 +601,9 @@ int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, cha
NULL;
/* Blocking transfer. */
desc.p_tx_buffer = tx_actual_buffer;
desc.p_rx_buffer = rx_actual_buffer;
desc.tx_length = tx_actual_length;
desc.rx_length = rx_actual_length;
#if NRFX_CHECK(NRFX_SPIM_ENABLED)
result = nrfx_spim_xfer(&nordic_nrf5_spim_instance[instance],
&desc, 0);
#elif NRFX_CHECK(NRFX_SPI_ENABLED)
nrfx_spi_xfer_desc_t desc = NRFX_SPI_XFER_TRX(tx_actual_buffer, tx_actual_length, rx_actual_buffer, rx_actual_length);
result = nrfx_spi_xfer(&nordic_nrf5_spi_instance[instance],
&desc, 0);
#endif
/* Update loop variables. */
tx_length -= tx_actual_length;
tx_offset += tx_actual_length;
@ -624,6 +611,7 @@ int spi_master_block_write(spi_t *obj, const char *tx_buffer, int tx_length, cha
rx_length -= rx_actual_length;
rx_offset += rx_actual_length;
}
#endif
/* Manually set chip select pin if defined. */
if (spi_inst->cs != NC) {

4
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/modules/nrfx/drivers/include/nrfx_spim.h
View File

@ -142,8 +142,8 @@ typedef struct
#define NRFX_SPIM_DEFAULT_EXTENDED_CONFIG \
.dcx_pin = NRFX_SPIM_PIN_NOT_USED, \
.rx_delay = 0x00, \
.ss_duration = 0x00, \
.use_hw_ss = false,
.use_hw_ss = false, \
.ss_duration = 0x00,
#else
#define NRFX_SPIM_DEFAULT_EXTENDED_CONFIG
#endif

11
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_SDK_15_0/modules/nrfx/drivers/src/nrfx_spim.c
View File

@ -247,14 +247,21 @@ nrfx_err_t nrfx_spim_init(nrfx_spim_t const * const p_instance,
NRF_GPIO_PIN_DIR_OUTPUT,
NRF_GPIO_PIN_INPUT_CONNECT,
NRF_GPIO_PIN_NOPULL,
NRF_GPIO_PIN_S0S1,
// Use High Drive if using SPIM3
(p_instance->drv_inst_idx == NRFX_SPIM3_INST_IDX) ? NRF_GPIO_PIN_H0H1 : NRF_GPIO_PIN_S0S1,
NRF_GPIO_PIN_NOSENSE);
// - MOSI (optional) - output with initial value 0,
if (p_config->mosi_pin != NRFX_SPIM_PIN_NOT_USED)
{
mosi_pin = p_config->mosi_pin;
nrf_gpio_pin_clear(mosi_pin);
nrf_gpio_cfg_output(mosi_pin);
nrf_gpio_cfg(p_config->mosi_pin,
NRF_GPIO_PIN_DIR_OUTPUT,
NRF_GPIO_PIN_INPUT_DISCONNECT,
NRF_GPIO_PIN_NOPULL,
// Use High Drive if using SPIM3
(p_instance->drv_inst_idx == NRFX_SPIM3_INST_IDX) ? NRF_GPIO_PIN_H0H1 : NRF_GPIO_PIN_S0S1,
NRF_GPIO_PIN_NOSENSE);
}
else
{