You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/11/18 21:04:00 UTC
[2/2] incubator-mynewt-core git commit: No jira ticket: removal of
nordic SDK code from hal_spi for the nrf51 and nrf52.
No jira ticket: removal of nordic SDK code from hal_spi for
the nrf51 and nrf52.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/4fcb950c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/4fcb950c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/4fcb950c
Branch: refs/heads/develop
Commit: 4fcb950cf167a3277e1e0e062df15b64ac3bb07d
Parents: 8813bdf
Author: William San Filippo <wi...@runtime.io>
Authored: Fri Nov 18 13:03:10 2016 -0800
Committer: William San Filippo <wi...@runtime.io>
Committed: Fri Nov 18 13:03:53 2016 -0800
----------------------------------------------------------------------
apps/spitest/src/main.c | 2 +-
hw/bsp/arduino_primo_nrf52/src/hal_bsp.c | 31 +-
hw/bsp/arduino_primo_nrf52/syscfg.yml | 10 +-
hw/bsp/bmd300eval/src/hal_bsp.c | 31 +-
hw/bsp/nrf51-arduino_101/src/hal_bsp.c | 27 +-
hw/bsp/nrf51-arduino_101/syscfg.yml | 4 +
hw/bsp/nrf51-blenano/src/hal_bsp.c | 29 +-
hw/bsp/nrf51-blenano/syscfg.yml | 4 +
hw/bsp/nrf51dk-16kbram/src/hal_bsp.c | 29 +-
hw/bsp/nrf51dk-16kbram/syscfg.yml | 4 +
hw/bsp/nrf51dk/src/hal_bsp.c | 33 +-
hw/bsp/nrf51dk/syscfg.yml | 4 +
hw/bsp/nrf52dk/src/hal_bsp.c | 31 +-
hw/bsp/nrf52dk/syscfg.yml | 8 +
hw/bsp/rb-nano2/src/hal_bsp.c | 45 +-
hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h | 8 +
hw/mcu/nordic/nrf51xxx/src/hal_spi.c | 518 ++++++++---------
hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h | 8 +
hw/mcu/nordic/nrf52xxx/src/hal_spi.c | 583 +++++++++-----------
19 files changed, 576 insertions(+), 833 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/apps/spitest/src/main.c
----------------------------------------------------------------------
diff --git a/apps/spitest/src/main.c b/apps/spitest/src/main.c
index 969973f..9ce88ce 100755
--- a/apps/spitest/src/main.c
+++ b/apps/spitest/src/main.c
@@ -420,7 +420,7 @@ init_tasks(void)
/* Initialize global test semaphore */
os_sem_init(&g_test_sem, 0);
-#ifdef SPI_SLAVE
+#if defined(SPI_SLAVE) || defined(SPI_MASTER)
pstack = malloc(sizeof(os_stack_t)*TASK1_STACK_SIZE);
assert(pstack);
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
index 9472119..0535787 100644
--- a/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
+++ b/hw/bsp/arduino_primo_nrf52/src/hal_bsp.c
@@ -31,12 +31,6 @@
#include "syscfg/syscfg.h"
#include "flash_map/flash_map.h"
#include "uart/uart.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_0_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#if MYNEWT_VAL(UART_0)
#include "uart_hal/uart_hal.h"
#endif
@@ -80,37 +74,22 @@ static struct nrf52_adc_dev_cfg os_bsp_adc0_config = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
-static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0m_cfg = {
.sck_pin = 24,
.mosi_pin = 23,
.miso_pin = 22,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
};
#endif
#if MYNEWT_VAL(SPI_0_SLAVE)
-static const nrf_drv_spis_config_t os_bsp_spi0s_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0s_cfg = {
.sck_pin = 24,
.mosi_pin = 23,
.miso_pin = 22,
- .csn_pin = 19,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 19,
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/arduino_primo_nrf52/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/syscfg.yml b/hw/bsp/arduino_primo_nrf52/syscfg.yml
index 5b89ff9..cea5591 100644
--- a/hw/bsp/arduino_primo_nrf52/syscfg.yml
+++ b/hw/bsp/arduino_primo_nrf52/syscfg.yml
@@ -83,22 +83,30 @@ syscfg.defs:
SPI_0_MASTER:
description: 'SPI 0 master'
- value: 0
+ value: 1
+ restrictions:
+ - "!SPI_0_SLAVE"
SPI_0_MASTER_SS_PIN:
description: 'SPI 0 (master) SS pin number.'
value: 19
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_0_SLAVE:
description: 'SPI 0 slave'
value: 0
+ restrictions:
+ - "!SPI_0_MASTER"
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 0
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF52 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/bmd300eval/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/bmd300eval/src/hal_bsp.c b/hw/bsp/bmd300eval/src/hal_bsp.c
index d545611..dff0f88 100644
--- a/hw/bsp/bmd300eval/src/hal_bsp.c
+++ b/hw/bsp/bmd300eval/src/hal_bsp.c
@@ -32,12 +32,6 @@
#include "uart_hal/uart_hal.h"
#include "os/os_dev.h"
#include "bsp.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_0_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "nrf.h"
@@ -76,37 +70,22 @@ static struct nrf52_adc_dev_cfg os_bsp_adc0_config = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
-static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0m_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
};
#endif
#if MYNEWT_VAL(SPI_0_SLAVE)
-static const nrf_drv_spis_config_t os_bsp_spi0s_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0s_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .csn_pin = 22,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ssn_pin = 22,
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
index 97336ec..9e6837d 100644
--- a/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
+++ b/hw/bsp/nrf51-arduino_101/src/hal_bsp.c
@@ -30,12 +30,6 @@
#include "hal/hal_flash.h"
#include "bsp/cmsis_nvic.h"
#include "nrf51_bitfields.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_1_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "hal/hal_spi.h"
#include "os/os_dev.h"
#include "uart/uart.h"
@@ -53,21 +47,13 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
.miso_pin = 28,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
};
#endif
@@ -76,14 +62,7 @@ static const nrf_drv_spis_config_t os_bsp_spi1s_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
.miso_pin = 28,
- .csn_pin = 24,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 24
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51-arduino_101/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-arduino_101/syscfg.yml b/hw/bsp/nrf51-arduino_101/syscfg.yml
index 329e43e..42e8c64 100644
--- a/hw/bsp/nrf51-arduino_101/syscfg.yml
+++ b/hw/bsp/nrf51-arduino_101/syscfg.yml
@@ -67,12 +67,16 @@ syscfg.defs:
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 1
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF51 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51-blenano/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/src/hal_bsp.c b/hw/bsp/nrf51-blenano/src/hal_bsp.c
index 1b6ef42..15d92f6 100644
--- a/hw/bsp/nrf51-blenano/src/hal_bsp.c
+++ b/hw/bsp/nrf51-blenano/src/hal_bsp.c
@@ -29,12 +29,6 @@
#include "flash_map/flash_map.h"
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_1_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "os/os_dev.h"
@@ -53,21 +47,13 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
- .miso_pin = 28,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
+ .miso_pin = 28
};
#endif
@@ -76,14 +62,7 @@ static const nrf_drv_spis_config_t os_bsp_spi1s_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
.miso_pin = 28,
- .csn_pin = 24,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 24
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51-blenano/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51-blenano/syscfg.yml b/hw/bsp/nrf51-blenano/syscfg.yml
index dd439ac..defcd55 100644
--- a/hw/bsp/nrf51-blenano/syscfg.yml
+++ b/hw/bsp/nrf51-blenano/syscfg.yml
@@ -64,12 +64,16 @@ syscfg.defs:
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 0
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF51 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
index fbe9e9d..44dbc8c 100644
--- a/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
+++ b/hw/bsp/nrf51dk-16kbram/src/hal_bsp.c
@@ -32,12 +32,6 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_1_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "uart/uart.h"
@@ -55,21 +49,13 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
- .miso_pin = 28,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
+ .miso_pin = 28
};
#endif
@@ -78,14 +64,7 @@ static const nrf_drv_spis_config_t os_bsp_spi1s_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
.miso_pin = 28,
- .csn_pin = 24,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 24
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51dk-16kbram/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk-16kbram/syscfg.yml b/hw/bsp/nrf51dk-16kbram/syscfg.yml
index 4b0d699..8a076f5 100644
--- a/hw/bsp/nrf51dk-16kbram/syscfg.yml
+++ b/hw/bsp/nrf51dk-16kbram/syscfg.yml
@@ -64,12 +64,16 @@ syscfg.defs:
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 0
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF51 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51dk/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/src/hal_bsp.c b/hw/bsp/nrf51dk/src/hal_bsp.c
index 7a9a3c5..ae2c05e 100644
--- a/hw/bsp/nrf51dk/src/hal_bsp.c
+++ b/hw/bsp/nrf51dk/src/hal_bsp.c
@@ -32,12 +32,6 @@
#include "hal/hal_flash.h"
#include "hal/hal_spi.h"
#include "hal/hal_i2c.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_1_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "uart/uart.h"
@@ -55,37 +49,22 @@ static const struct nrf51_uart_cfg os_bsp_uart0_cfg = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
-static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
+static const struct nrf51_hal_spi_cfg os_bsp_spi0m_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
- .miso_pin = 28,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
+ .miso_pin = 28
};
#endif
#if MYNEWT_VAL(SPI_1_SLAVE)
-static const nrf_drv_spis_config_t os_bsp_spi1s_cfg = {
+static const struct nrf51_hal_spi_cfg os_bsp_spi1s_cfg = {
.sck_pin = 29,
.mosi_pin = 25,
.miso_pin = 28,
- .csn_pin = 24,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 24
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf51dk/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf51dk/syscfg.yml b/hw/bsp/nrf51dk/syscfg.yml
index e2baf7a..78129ce 100644
--- a/hw/bsp/nrf51dk/syscfg.yml
+++ b/hw/bsp/nrf51dk/syscfg.yml
@@ -64,12 +64,16 @@ syscfg.defs:
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 0
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF51 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf52dk/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/hal_bsp.c b/hw/bsp/nrf52dk/src/hal_bsp.c
index dc9f697..b016913 100644
--- a/hw/bsp/nrf52dk/src/hal_bsp.c
+++ b/hw/bsp/nrf52dk/src/hal_bsp.c
@@ -35,12 +35,6 @@
#include "uart_hal/uart_hal.h"
#include "os/os_dev.h"
#include "bsp.h"
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_0_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "nrf.h"
@@ -78,37 +72,22 @@ static struct nrf52_adc_dev_cfg os_bsp_adc0_config = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
-static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0m_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
};
#endif
#if MYNEWT_VAL(SPI_0_SLAVE)
-static const nrf_drv_spis_config_t os_bsp_spi0s_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0s_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .csn_pin = 22,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 22,
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/nrf52dk/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/syscfg.yml b/hw/bsp/nrf52dk/syscfg.yml
index 72f6afd..bc62394 100644
--- a/hw/bsp/nrf52dk/syscfg.yml
+++ b/hw/bsp/nrf52dk/syscfg.yml
@@ -65,21 +65,29 @@ syscfg.defs:
SPI_0_MASTER:
description: 'SPI 0 master'
value: 0
+ restrictions:
+ - "!SPI_0_SLAVE"
SPI_0_MASTER_SS_PIN:
description: 'SPI 0 (master) SS pin number.'
value: 22
SPI_1_MASTER:
description: 'SPI 1 master'
value: 0
+ restrictions:
+ - "!SPI_1_SLAVE"
SPI_1_MASTER_SS_PIN:
description: 'SPI 1 (master) SS pin number.'
value: -1
SPI_0_SLAVE:
description: 'SPI 0 slave'
value: 0
+ restrictions:
+ - "!SPI_0_MASTER"
SPI_1_SLAVE:
description: 'SPI 1 slave'
value: 0
+ restrictions:
+ - "!SPI_1_MASTER"
TIMER_0:
description: 'NRF52 Timer 0'
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/bsp/rb-nano2/src/hal_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/rb-nano2/src/hal_bsp.c b/hw/bsp/rb-nano2/src/hal_bsp.c
index 100cf9a..cd54d8d 100644
--- a/hw/bsp/rb-nano2/src/hal_bsp.c
+++ b/hw/bsp/rb-nano2/src/hal_bsp.c
@@ -33,26 +33,6 @@
#include "uart/uart.h"
#include "uart_hal/uart_hal.h"
#include "os/os_dev.h"
-#include "bsp.h"
-
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_0_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
-#include "nrf_drv_config.h"
-#include "app_util_platform.h"
-#include "nrf.h"
-#include "app_error.h"
-#include "nrf_drv_saadc.h"
-
-#if MYNEWT_VAL(SPI_0_MASTER)
-#include "nrf_drv_spi.h"
-#endif
-#if MYNEWT_VAL(SPI_0_SLAVE)
-#include "nrf_drv_spis.h"
-#endif
#include "nrf_drv_config.h"
#include "app_util_platform.h"
#include "nrf.h"
@@ -71,37 +51,22 @@ static const struct nrf52_uart_cfg os_bsp_uart0_cfg = {
#if MYNEWT_VAL(SPI_0_MASTER)
/*
- * NOTE: do not set the ss pin here! This would cause the nordic SDK
- * to start using the SS pin when configured as a master and this is
- * not what our HAL expects. Our HAL expects that the SS pin, if used,
- * is treated as a gpio line and is handled outside the SPI routines.
+ * NOTE: Our HAL expects that the SS pin, if used, is treated as a gpio line
+ * and is handled outside the SPI routines.
*/
-static const nrf_drv_spi_config_t os_bsp_spi0m_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0m_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .ss_pin = NRF_DRV_SPI_PIN_NOT_USED,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1,
- .orc = 0xFF,
- .frequency = NRF_DRV_SPI_FREQ_4M,
- .mode = NRF_DRV_SPI_MODE_0,
- .bit_order = NRF_DRV_SPI_BIT_ORDER_MSB_FIRST
};
#endif
#if MYNEWT_VAL(SPI_0_SLAVE)
-static const nrf_drv_spis_config_t os_bsp_spi0s_cfg = {
+static const struct nrf52_hal_spi_cfg os_bsp_spi0s_cfg = {
.sck_pin = 23,
.mosi_pin = 24,
.miso_pin = 25,
- .csn_pin = 22,
- .miso_drive = NRF_DRV_SPIS_DEFAULT_MISO_DRIVE,
- .csn_pullup = NRF_GPIO_PIN_PULLUP,
- .orc = NRF_DRV_SPIS_DEFAULT_ORC,
- .def = NRF_DRV_SPIS_DEFAULT_DEF,
- .mode = NRF_DRV_SPIS_MODE_0,
- .bit_order = NRF_DRV_SPIS_BIT_ORDER_MSB_FIRST,
- .irq_priority = (1 << __NVIC_PRIO_BITS) - 1
+ .ss_pin = 22,
};
#endif
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h b/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h
index d1e9eef..2d88fa3 100755
--- a/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h
+++ b/hw/mcu/nordic/nrf51xxx/include/mcu/nrf51_hal.h
@@ -52,6 +52,14 @@ struct nrf51_hal_i2c_cfg {
uint32_t i2c_frequency;
};
+/* SPI configuration (used for both master and slave) */
+struct nrf51_hal_spi_cfg {
+ uint8_t sck_pin;
+ uint8_t mosi_pin;
+ uint8_t miso_pin;
+ uint8_t ss_pin;
+};
+
struct hal_flash;
extern const struct hal_flash nrf51_flash_dev;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/mcu/nordic/nrf51xxx/src/hal_spi.c
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf51xxx/src/hal_spi.c b/hw/mcu/nordic/nrf51xxx/src/hal_spi.c
index b40306b..21ae640 100644
--- a/hw/mcu/nordic/nrf51xxx/src/hal_spi.c
+++ b/hw/mcu/nordic/nrf51xxx/src/hal_spi.c
@@ -24,19 +24,16 @@
#include <assert.h>
#include <hal/hal_spi.h>
#include <bsp/cmsis_nvic.h>
-#include <nrf.h>
-#include <nrf_spi.h>
-#include <nrf_spis.h>
-#include <nrf_drv_spi.h>
-#include <nrf_drv_spis.h>
-#include <nrf_drv_common.h>
-#include <app_util_platform.h>
+#include "mcu/nrf51_hal.h"
+#include "nrf51_bitfields.h"
/* XXX:
* 1) what about stats?
* 2) Dealing with errors (OVERFLOW, OVERREAD)
* 3) Dont think I need dummy_rx as I can set master RX maxcnt to zero.
*/
+/* IRQ handler type */
+typedef void (*nrf51_spi_irq_handler_t)(void);
/* The maximum number of SPI interfaces we will allow */
#define NRF51_HAL_SPI_MAX (2)
@@ -66,10 +63,13 @@ struct nrf51_hal_spi {
uint16_t nhs_txd_bytes;
struct hal_spi_settings spi_cfg; /* Slave and master */
union {
- nrf_drv_spi_t spim;
- nrf_drv_spis_t spis;
+ NRF_SPI_Type *spim;
+ NRF_SPIS_Type *spis;
} nhs_spi;
+ /* IRQ number */
+ IRQn_Type irq_num;
+
/* Pointers to tx/rx buffers */
uint8_t *nhs_txbuf;
uint8_t *nhs_rxbuf;
@@ -99,16 +99,6 @@ static const struct nrf51_hal_spi *nrf51_hal_spis[NRF51_HAL_SPI_MAX] = {
#endif
};
-#if MYNEWT_VAL(SPI_0_MASTER)
-nrf_drv_spi_t inst_spi0_m = NRF_DRV_SPI_INSTANCE(0);
-#endif
-#if MYNEWT_VAL(SPI_1_MASTER)
-nrf_drv_spi_t inst_spi1_m = NRF_DRV_SPI_INSTANCE(1);
-#endif
-#if MYNEWT_VAL(SPI_1_SLAVE)
-nrf_drv_spis_t inst_spi1_s = NRF_DRV_SPIS_INSTANCE(1);
-#endif
-
#define NRF51_HAL_SPI_RESOLVE(__n, __v) \
if ((__n) >= NRF51_HAL_SPI_MAX) { \
rc = EINVAL; \
@@ -124,18 +114,18 @@ nrf_drv_spis_t inst_spi1_s = NRF_DRV_SPIS_INSTANCE(1);
static void
nrf51_irqm_handler(struct nrf51_hal_spi *spi)
{
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
- if (nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
+ if (spim->EVENTS_READY) {
+ spim->EVENTS_READY = 0;
if (spi->spi_xfr_flag == 0) {
return;
}
if (spi->nhs_rxbuf) {
- spi->nhs_rxbuf[spi->nhs_rxd_bytes] = nrf_spi_rxd_get(p_spi);
+ spi->nhs_rxbuf[spi->nhs_rxd_bytes] = spim->RXD;
}
++spi->nhs_rxd_bytes;
if (spi->nhs_rxd_bytes == spi->nhs_buflen) {
@@ -143,10 +133,10 @@ nrf51_irqm_handler(struct nrf51_hal_spi *spi)
spi->txrx_cb_func(spi->txrx_cb_arg, spi->nhs_buflen);
}
spi->spi_xfr_flag = 0;
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
}
if (spi->nhs_txd_bytes != spi->nhs_buflen) {
- nrf_spi_txd_set(p_spi, spi->nhs_txbuf[spi->nhs_txd_bytes]);
+ spim->TXD = spi->nhs_txbuf[spi->nhs_txd_bytes];
++spi->nhs_txd_bytes;
}
}
@@ -158,41 +148,48 @@ static void
nrf51_irqs_handler(struct nrf51_hal_spi *spi)
{
uint8_t xfr_len;
- NRF_SPIS_Type *p_spis;
+ NRF_SPIS_Type *spis;
- p_spis = spi->nhs_spi.spis.p_reg;
+ spis = spi->nhs_spi.spis;
/* Semaphore acquired event */
- if (nrf_spis_event_check(p_spis, NRF_SPIS_EVENT_ACQUIRED)) {
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_ACQUIRED);
+ if (spis->EVENTS_ACQUIRED) {
+ spis->EVENTS_ACQUIRED = 0;
if (spi->slave_state == HAL_SPI_SLAVE_STATE_ACQ_SEM) {
if (spi->nhs_txbuf == NULL) {
- nrf_spis_tx_buffer_set(p_spis, 0, 0);
+ spis->TXDPTR = 0;
+ spis->MAXTX = 0;
} else {
- nrf_spis_tx_buffer_set(p_spis, spi->nhs_txbuf, spi->nhs_buflen);
+ spis->TXDPTR = (uint32_t)spi->nhs_txbuf;
+ spis->MAXTX = spi->nhs_buflen;
}
if (spi->nhs_rxbuf == NULL) {
- nrf_spis_rx_buffer_set(p_spis, 0, 0);
+ spis->RXDPTR = 0;
+ spis->MAXRX = 0;
+
} else {
- nrf_spis_rx_buffer_set(p_spis, spi->nhs_rxbuf, spi->nhs_buflen);
+ spis->RXDPTR = (uint32_t)spi->nhs_rxbuf;
+ spis->MAXRX = spi->nhs_buflen;
}
- nrf_spis_task_trigger(p_spis, NRF_SPIS_TASK_RELEASE);
+ spis->TASKS_RELEASE = 1;
spi->slave_state = HAL_SPI_SLAVE_STATE_READY;
}
}
/* SPI transaction complete */
- if (nrf_spis_event_check(p_spis, NRF_SPIS_EVENT_END)) {
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_END);
+ if (spis->EVENTS_END) {
+ spis->EVENTS_END = 0;
+
if (spi->slave_state == HAL_SPI_SLAVE_STATE_READY) {
if (spi->txrx_cb_func) {
/* Get transfer length */
if (spi->nhs_txbuf == NULL) {
- xfr_len = nrf_spis_rx_amount_get(p_spis);
+ xfr_len = (uint8_t)spis->AMOUNTRX;
+
} else {
- xfr_len = nrf_spis_tx_amount_get(p_spis);
+ xfr_len = (uint8_t)spis->AMOUNTTX;
}
spi->txrx_cb_func(spi->txrx_cb_arg, xfr_len);
}
@@ -241,85 +238,78 @@ hal_spi_config_master(struct nrf51_hal_spi *spi,
struct hal_spi_settings *settings)
{
int rc;
- NRF_SPI_Type *p_spi;
- nrf_spi_frequency_t frequency;
- nrf_spi_mode_t spi_mode;
- nrf_spi_bit_order_t bit_order;
+ uint32_t nrf_config;
+ uint32_t frequency;
+ NRF_SPI_Type *spim;
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
memcpy(&spi->spi_cfg, settings, sizeof(*settings));
/* Only 8-bit word sizes supported. */
- switch (settings->word_size) {
- case HAL_SPI_WORD_SIZE_8BIT:
- break;
- default:
- rc = EINVAL;
- goto err;
- }
-
+ rc = 0;
switch (settings->data_mode) {
case HAL_SPI_MODE0:
- spi_mode = NRF_SPI_MODE_0;
+ nrf_config = (SPI_CONFIG_CPOL_ActiveHigh << SPI_CONFIG_CPOL_Pos) |
+ (SPI_CONFIG_CPHA_Leading << SPI_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE1:
- spi_mode = NRF_SPI_MODE_1;
+ nrf_config = (SPI_CONFIG_CPOL_ActiveHigh << SPI_CONFIG_CPOL_Pos) |
+ (SPI_CONFIG_CPHA_Trailing << SPI_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE2:
- spi_mode = NRF_SPI_MODE_2;
+ nrf_config = (SPI_CONFIG_CPOL_ActiveLow << SPI_CONFIG_CPOL_Pos) |
+ (SPI_CONFIG_CPHA_Leading << SPI_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE3:
- spi_mode = NRF_SPI_MODE_3;
+ nrf_config = (SPI_CONFIG_CPOL_ActiveLow << SPI_CONFIG_CPOL_Pos) |
+ (SPI_CONFIG_CPHA_Trailing << SPI_CONFIG_CPHA_Pos);
break;
default:
- spi_mode = 0;
+ nrf_config = 0;
+ rc = EINVAL;
break;
}
- switch (settings->data_order) {
- case HAL_SPI_MSB_FIRST:
- bit_order = NRF_SPI_BIT_ORDER_MSB_FIRST;
- break;
- case HAL_SPI_LSB_FIRST:
- bit_order = NRF_SPI_BIT_ORDER_LSB_FIRST;
- break;
- default:
- bit_order = 0;
- break;
+ if (settings->data_order == HAL_SPI_LSB_FIRST) {
+ nrf_config |= SPI_CONFIG_ORDER_LsbFirst;
}
- nrf_spi_configure(p_spi, spi_mode, bit_order);
+ spim->CONFIG = nrf_config;
switch (settings->baudrate) {
case 125:
- frequency = NRF_SPI_FREQ_125K;
+ frequency = SPI_FREQUENCY_FREQUENCY_K125;
break;
case 250:
- frequency = NRF_SPI_FREQ_250K;
+ frequency = SPI_FREQUENCY_FREQUENCY_K250;
break;
case 500:
- frequency = NRF_SPI_FREQ_500K;
+ frequency = SPI_FREQUENCY_FREQUENCY_K500;
break;
case 1000:
- frequency = NRF_SPI_FREQ_1M;
+ frequency = SPI_FREQUENCY_FREQUENCY_M1;
break;
case 2000:
- frequency = NRF_SPI_FREQ_2M;
+ frequency = SPI_FREQUENCY_FREQUENCY_M2;
break;
case 4000:
- frequency = NRF_SPI_FREQ_4M;
+ frequency = SPI_FREQUENCY_FREQUENCY_M4;
break;
case 8000:
- frequency = NRF_SPI_FREQ_8M;
+ frequency = SPI_FREQUENCY_FREQUENCY_M8;
break;
default:
+ frequency = 0;
rc = EINVAL;
- goto err;
+ break;
}
- nrf_spi_frequency_set(p_spi, frequency);
+ spim->FREQUENCY = frequency;
- return (0);
-err:
- return (rc);
+ /* Only supports 8-bit word size */
+ if (settings->word_size != HAL_SPI_WORD_SIZE_8BIT) {
+ rc = EINVAL;
+ }
+
+ return rc;
}
static int
@@ -327,205 +317,149 @@ hal_spi_config_slave(struct nrf51_hal_spi *spi,
struct hal_spi_settings *settings)
{
int rc;
- NRF_SPIS_Type *p_spis;
- nrf_spis_mode_t spi_mode;
- nrf_spis_bit_order_t bit_order;
+ uint32_t nrf_config;
+ NRF_SPIS_Type *spis;
- p_spis = spi->nhs_spi.spis.p_reg;
+ spis = spi->nhs_spi.spis;
memcpy(&spi->spi_cfg, settings, sizeof(*settings));
- spi_mode = 0;
+ rc = 0;
switch (settings->data_mode) {
case HAL_SPI_MODE0:
- spi_mode = NRF_SPIS_MODE_0;
+ nrf_config = (SPIS_CONFIG_CPOL_ActiveHigh << SPIS_CONFIG_CPOL_Pos) |
+ (SPIS_CONFIG_CPHA_Leading << SPIS_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE1:
- spi_mode = NRF_SPIS_MODE_1;
+ nrf_config = (SPIS_CONFIG_CPOL_ActiveHigh << SPIS_CONFIG_CPOL_Pos) |
+ (SPIS_CONFIG_CPHA_Trailing << SPIS_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE2:
- spi_mode = NRF_SPIS_MODE_2;
+ nrf_config = (SPIS_CONFIG_CPOL_ActiveLow << SPIS_CONFIG_CPOL_Pos) |
+ (SPIS_CONFIG_CPHA_Leading << SPIS_CONFIG_CPHA_Pos);
break;
case HAL_SPI_MODE3:
- spi_mode = NRF_SPIS_MODE_3;
+ nrf_config = (SPIS_CONFIG_CPOL_ActiveLow << SPIS_CONFIG_CPOL_Pos) |
+ (SPIS_CONFIG_CPHA_Trailing << SPIS_CONFIG_CPHA_Pos);
+ break;
+ default:
+ nrf_config = 0;
+ rc = EINVAL;
break;
}
- bit_order = 0;
- switch (settings->data_order) {
- case HAL_SPI_MSB_FIRST:
- bit_order = NRF_SPIS_BIT_ORDER_MSB_FIRST;
- break;
- case HAL_SPI_LSB_FIRST:
- bit_order = NRF_SPIS_BIT_ORDER_LSB_FIRST;
- break;
+ if (settings->data_order == HAL_SPI_LSB_FIRST) {
+ nrf_config |= SPIS_CONFIG_ORDER_LsbFirst;
}
- nrf_spis_configure(p_spis, spi_mode, bit_order);
+ spis->CONFIG = nrf_config;
/* Only 8-bit word sizes supported. */
- switch (settings->word_size) {
- case HAL_SPI_WORD_SIZE_8BIT:
- break;
- default:
- rc = EINVAL;
- goto err;
+ if (settings->word_size != HAL_SPI_WORD_SIZE_8BIT) {
+ rc = EINVAL;
}
- return (0);
-
-err:
- return (rc);
+ return rc;
}
static int
-hal_spi_init_master(nrf_drv_spi_t *p_instance,
- nrf_drv_spi_config_t *p_config,
- nrf_drv_irq_handler_t handler)
+hal_spi_init_master(struct nrf51_hal_spi *spi,
+ struct nrf51_hal_spi_cfg *cfg,
+ nrf51_spi_irq_handler_t handler)
{
- uint32_t mosi_pin;
- uint32_t miso_pin;
- NRF_SPI_Type *p_spi;
-
-#if PERIPHERAL_RESOURCE_SHARING_ENABLED
- if (nrf_drv_common_per_res_acquire(p_instance->p_registers,
- handler) != NRF_SUCCESS) {
- return NRF_ERROR_BUSY;
- }
-#endif
+ NRF_SPI_Type *spim;
- /* Configure pins used by the peripheral:
- - SCK - output with initial value corresponding with the SPI mode used:
- 0 - for modes 0 and 1 (CPOL = 0), 1 - for modes 2 and 3 (CPOL = 1);
- according to the reference manual guidelines this pin and its input
- buffer must always be connected for the SPI to work.
- */
- if (p_config->mode <= NRF_DRV_SPI_MODE_1) {
- nrf_gpio_pin_clear(p_config->sck_pin);
+ /* Configure SCK pin */
+ if (spi->spi_cfg.data_mode <= HAL_SPI_MODE1) {
+ NRF_GPIO->OUTCLR = (1UL << cfg->sck_pin);
} else {
- nrf_gpio_pin_set(p_config->sck_pin);
+ NRF_GPIO->OUTSET = (1UL << cfg->sck_pin);
}
-
- NRF_GPIO->PIN_CNF[p_config->sck_pin] =
+ NRF_GPIO->PIN_CNF[cfg->sck_pin] =
(GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos)
| (GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos)
| (GPIO_PIN_CNF_PULL_Disabled << GPIO_PIN_CNF_PULL_Pos)
| (GPIO_PIN_CNF_DRIVE_S0S1 << GPIO_PIN_CNF_DRIVE_Pos)
| (GPIO_PIN_CNF_SENSE_Disabled << GPIO_PIN_CNF_SENSE_Pos);
- /* - MOSI (optional) - output with initial value 0 */
- if (p_config->mosi_pin != NRF_DRV_SPI_PIN_NOT_USED) {
- mosi_pin = p_config->mosi_pin;
- nrf_gpio_pin_clear(mosi_pin);
- nrf_gpio_cfg_output(mosi_pin);
- } else {
- mosi_pin = NRF_SPI_PIN_NOT_CONNECTED;
- }
+ /* Configure MOSI */
+ NRF_GPIO->OUTCLR = (1UL << cfg->mosi_pin);
+ NRF_GPIO->PIN_CNF[cfg->mosi_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Output << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos);
- /* - MISO (optional) - input*/
- if (p_config->miso_pin != NRF_DRV_SPI_PIN_NOT_USED) {
- miso_pin = p_config->miso_pin;
- nrf_gpio_cfg_input(miso_pin, NRF_GPIO_PIN_NOPULL);
- } else {
- miso_pin = NRF_SPI_PIN_NOT_CONNECTED;
- }
- p_spi = (NRF_SPI_Type *)p_instance->p_registers;
- nrf_spi_pins_set(p_spi, p_config->sck_pin, mosi_pin, miso_pin);
- nrf_spi_frequency_set(p_spi, (nrf_spi_frequency_t)p_config->frequency);
- nrf_spi_configure(p_spi ,(nrf_spi_mode_t)p_config->mode,
- (nrf_spi_bit_order_t)p_config->bit_order);
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
- NVIC_SetVector(p_instance->irq, (uint32_t)handler);
- nrf_drv_common_irq_enable(p_instance->irq, p_config->irq_priority);
-
- return NRF_SUCCESS;
+ /* Configure MISO */
+ NRF_GPIO->PIN_CNF[cfg->miso_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos);
+
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
+ spim->PSELSCK = cfg->sck_pin;
+ spim->PSELMOSI = cfg->mosi_pin;
+ spim->PSELMISO = cfg->miso_pin;
+
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
+
+ NVIC_SetVector(spi->irq_num, (uint32_t)handler);
+ NVIC_SetPriority(spi->irq_num, (1 << __NVIC_PRIO_BITS) - 1);
+ NVIC_ClearPendingIRQ(spi->irq_num);
+ NVIC_EnableIRQ(spi->irq_num);
+
+ return 0;
}
static int
-hal_spi_init_slave(nrf_drv_spis_t *p_instance,
- nrf_drv_spis_config_t *p_config,
- nrf_drv_irq_handler_t handler)
+hal_spi_init_slave(struct nrf51_hal_spi *spi,
+ struct nrf51_hal_spi_cfg *cfg,
+ nrf51_spi_irq_handler_t handler)
{
- uint32_t mosi_pin;
- uint32_t miso_pin;
- NRF_SPIS_Type *p_spis;
-
-#if PERIPHERAL_RESOURCE_SHARING_ENABLED
- if (nrf_drv_common_per_res_acquire(p_instance->p_reg,
- handler) != NRF_SUCCESS) {
- return NRF_ERROR_BUSY;
- }
-#endif
+ NRF_SPIS_Type *spis;
- if ((uint32_t)p_config->mode > (uint32_t)NRF_DRV_SPIS_MODE_3) {
- return NRF_ERROR_INVALID_PARAM;
- }
+ NRF_GPIO->PIN_CNF[cfg->miso_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos);
- if (p_config->miso_pin != NRF_DRV_SPIS_PIN_NOT_USED) {
- nrf_gpio_cfg(p_config->miso_pin,
- NRF_GPIO_PIN_DIR_INPUT,
- NRF_GPIO_PIN_INPUT_CONNECT,
- NRF_GPIO_PIN_NOPULL,
- p_config->miso_drive,
- NRF_GPIO_PIN_NOSENSE);
- miso_pin = p_config->miso_pin;
- } else {
- miso_pin = NRF_SPIS_PIN_NOT_CONNECTED;
- }
+ NRF_GPIO->PIN_CNF[cfg->mosi_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos);
- if (p_config->mosi_pin != NRF_DRV_SPIS_PIN_NOT_USED) {
- nrf_gpio_cfg(p_config->mosi_pin,
- NRF_GPIO_PIN_DIR_INPUT,
- NRF_GPIO_PIN_INPUT_CONNECT,
- NRF_GPIO_PIN_NOPULL,
- NRF_GPIO_PIN_S0S1,
- NRF_GPIO_PIN_NOSENSE);
- mosi_pin = p_config->mosi_pin;
- } else {
- mosi_pin = NRF_SPIS_PIN_NOT_CONNECTED;
- }
+ NRF_GPIO->PIN_CNF[cfg->ss_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos);
+
+ NRF_GPIO->PIN_CNF[cfg->sck_pin] =
+ ((uint32_t)GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos) |
+ ((uint32_t)GPIO_PIN_CNF_INPUT_Connect << GPIO_PIN_CNF_INPUT_Pos);
- nrf_gpio_cfg(p_config->csn_pin,
- NRF_GPIO_PIN_DIR_INPUT,
- NRF_GPIO_PIN_INPUT_CONNECT,
- p_config->csn_pullup,
- NRF_GPIO_PIN_S0S1,
- NRF_GPIO_PIN_NOSENSE);
-
- nrf_gpio_cfg(p_config->sck_pin,
- NRF_GPIO_PIN_DIR_INPUT,
- NRF_GPIO_PIN_INPUT_CONNECT,
- NRF_GPIO_PIN_NOPULL,
- NRF_GPIO_PIN_S0S1,
- NRF_GPIO_PIN_NOSENSE);
-
- p_spis = (NRF_SPIS_Type *)p_instance->p_reg;
- nrf_spis_pins_set(p_spis, p_config->sck_pin, mosi_pin, miso_pin, p_config->csn_pin);
- nrf_spis_configure(p_spis, (nrf_spis_mode_t) p_config->mode,
- (nrf_spis_bit_order_t) p_config->bit_order);
-
- /* Configure DEF and ORC characters. */
- nrf_spis_def_set(p_spis, p_config->def);
- nrf_spis_orc_set(p_spis, p_config->orc);
+ spis = (NRF_SPIS_Type *)spi->nhs_spi.spis;
+ spis->PSELSCK = cfg->sck_pin;
+ spis->PSELMOSI = cfg->mosi_pin;
+ spis->PSELMISO = cfg->miso_pin;
+ spis->PSELCSN = cfg->ss_pin;
/* Disable interrupt and clear any interrupt events */
- nrf_spis_int_disable(p_spis, NRF_SPIS_INT_ACQUIRED_MASK | NRF_SPIS_INT_END_MASK);
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_END);
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_ACQUIRED);
+ spis->INTENCLR = SPIS_INTENSET_ACQUIRED_Msk | SPIS_INTENSET_END_Msk;
+ spis->EVENTS_END = 0;
+ spis->EVENTS_ACQUIRED = 0;
/* Enable END_ACQUIRE shortcut. */
- nrf_spis_shorts_enable(p_spis, NRF_SPIS_SHORT_END_ACQUIRE);
- NVIC_SetVector(p_instance->irq, (uint32_t)handler);
- nrf_drv_common_irq_enable(p_instance->irq, p_config->irq_priority);
+ spis->SHORTS = SPIS_SHORTS_END_ACQUIRE_Msk;
- return NRF_SUCCESS;
+ /* Set interrupt vector and enable IRQ */
+ NVIC_SetVector(spi->irq_num, (uint32_t)handler);
+ NVIC_SetPriority(spi->irq_num, (1 << __NVIC_PRIO_BITS) - 1);
+ NVIC_ClearPendingIRQ(spi->irq_num);
+ NVIC_EnableIRQ(spi->irq_num);
+
+ return 0;
}
static void
-hal_spi_master_send_first(NRF_SPI_Type *p_spi, uint8_t txval)
+hal_spi_master_send_first(NRF_SPI_Type *spim, uint8_t txval)
{
- while (nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {
- (void)nrf_spi_rxd_get(p_spi);
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
+ while (spim->EVENTS_READY) {
+ (void)spim->RXD;
+ spim->EVENTS_READY = 0;
}
- nrf_spi_txd_set(p_spi, txval);
+ spim->TXD = txval;
}
/**
@@ -544,7 +478,7 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
{
int rc;
struct nrf51_hal_spi *spi;
- nrf_drv_irq_handler_t irq_handler;
+ nrf51_spi_irq_handler_t irq_handler;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
@@ -562,9 +496,10 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
spi->spi_type = spi_type;
if (spi_num == 0) {
#if MYNEWT_VAL(SPI_0_MASTER)
+ spi->irq_num = SPI0_TWI0_IRQn;
irq_handler = nrf51_spi0_irq_handler;
if (spi_type == HAL_SPI_TYPE_MASTER) {
- memcpy(&spi->nhs_spi.spim, &inst_spi0_m, sizeof(inst_spi0_m));
+ spi->nhs_spi.spim = NRF_SPI0;
} else {
assert(0);
}
@@ -573,16 +508,17 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
#endif
} else if (spi_num == 1) {
#if MYNEWT_VAL(SPI_1_MASTER) || MYNEWT_VAL(SPI_1_SLAVE)
+ spi->irq_num = SPI1_TWI1_IRQn;
irq_handler = nrf51_spi1_irq_handler;
if (spi_type == HAL_SPI_TYPE_MASTER) {
#if MYNEWT_VAL(SPI_1_MASTER)
- memcpy(&spi->nhs_spi.spim, &inst_spi1_m, sizeof(inst_spi0_m));
+ spi->nhs_spi.spim = NRF_SPIM1;
#else
assert(0);
#endif
} else {
#if MYNEWT_VAL(SPI_1_SLAVE)
- memcpy(&spi->nhs_spi.spis, &inst_spi1_s, sizeof(inst_spi1_s));
+ spi->nhs_spi.spis = NRF_SPIS1;
#else
assert(0);
#endif
@@ -595,14 +531,12 @@ hal_spi_init(int spi_num, void *cfg, uint8_t spi_type)
}
if (spi_type == HAL_SPI_TYPE_MASTER) {
- rc = hal_spi_init_master(&spi->nhs_spi.spim,
- (nrf_drv_spi_config_t *)cfg,
+ rc = hal_spi_init_master(spi, (struct nrf51_hal_spi_cfg *)cfg,
irq_handler);
} else {
- rc = hal_spi_init_slave(&spi->nhs_spi.spis,
- (nrf_drv_spis_config_t *)cfg,
+ rc = hal_spi_init_slave(spi, (struct nrf51_hal_spi_cfg *)cfg,
irq_handler);
}
@@ -653,26 +587,26 @@ int
hal_spi_enable(int spi_num)
{
int rc;
- NRF_SPIS_Type *p_spis;
- NRF_SPI_Type *p_spi;
+ NRF_SPIS_Type *spis;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
if (spi->spi_type == HAL_SPI_TYPE_MASTER) {
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
- nrf_spi_enable(p_spi);
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
+ spim->ENABLE = (SPI_ENABLE_ENABLE_Enabled << SPI_ENABLE_ENABLE_Pos);
} else {
if (spi->txrx_cb_func == NULL) {
rc = EINVAL;
goto err;
}
- p_spis = spi->nhs_spi.spis.p_reg;
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_END);
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_ACQUIRED);
- nrf_spis_int_enable(p_spis, NRF_SPIS_INT_ACQUIRED_MASK | NRF_SPIS_INT_END_MASK);
- nrf_spis_enable(p_spis);
+ spis = spi->nhs_spi.spis;
+ spis->EVENTS_END = 0;
+ spis->EVENTS_ACQUIRED = 0;
+ spis->INTENSET = SPIS_INTENSET_ACQUIRED_Msk | SPIS_INTENSET_END_Msk;
+ spis->ENABLE = (SPIS_ENABLE_ENABLE_Enabled << SPIS_ENABLE_ENABLE_Pos);
}
rc = 0;
@@ -692,23 +626,23 @@ int
hal_spi_disable(int spi_num)
{
int rc;
- NRF_SPIS_Type *p_spis;
- NRF_SPI_Type *p_spi;
+ NRF_SPIS_Type *spis;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
if (spi->spi_type == HAL_SPI_TYPE_MASTER) {
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
spi->spi_xfr_flag = 0;
- nrf_spi_disable(p_spi);
+ spim->ENABLE = 0;
} else {
- p_spis = spi->nhs_spi.spis.p_reg;
- nrf_spis_int_disable(p_spis, NRF_SPI_IRQ_DISABLE_ALL);
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_END);
- nrf_spis_event_clear(p_spis, NRF_SPIS_EVENT_ACQUIRED);
- nrf_spis_disable(p_spis);
+ spis = spi->nhs_spi.spis;
+ spis->INTENCLR = NRF_SPI_IRQ_DISABLE_ALL;
+ spis->EVENTS_END = 0;
+ spis->EVENTS_ACQUIRED = 0;
+ spis->ENABLE = 0;
spi->slave_state = HAL_SPI_SLAVE_STATE_IDLE;
spi->nhs_txbuf = NULL;
spi->nhs_rxbuf = NULL;
@@ -737,18 +671,18 @@ hal_spi_tx_val(int spi_num, uint16_t val)
{
int rc;
uint16_t retval;
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
if (spi->spi_type == HAL_SPI_TYPE_MASTER) {
- p_spi = (NRF_SPI_Type *) spi->nhs_spi.spim.p_registers;
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
- nrf_spi_txd_set(p_spi, (uint8_t) val);
- while (!nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {}
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
- retval = (uint16_t)nrf_spi_rxd_get(p_spi);
+ spim = (NRF_SPI_Type *) spi->nhs_spi.spim;
+ spim->EVENTS_READY = 0;
+ spim->TXD = (uint8_t)val;
+ while (!spim->EVENTS_READY) {}
+ spim->EVENTS_READY = 0;
+ retval = (uint16_t)spim->RXD;
} else {
retval = 0xFFFF;
}
@@ -778,7 +712,7 @@ int
hal_spi_set_txrx_cb(int spi_num, hal_spi_txrx_cb txrx_cb, void *arg)
{
int rc;
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
@@ -787,8 +721,8 @@ hal_spi_set_txrx_cb(int spi_num, hal_spi_txrx_cb txrx_cb, void *arg)
* This looks odd, but the ENABLE register is in the same location for
* SPIM, SPI and SPIS
*/
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
- if (p_spi->ENABLE != 0) {
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
+ if (spim->ENABLE != 0) {
rc = -1;
} else {
spi->txrx_cb_func = txrx_cb;
@@ -831,7 +765,7 @@ hal_spi_txrx(int spi_num, void *txbuf, void *rxbuf, int len)
int txcnt;
uint8_t *txd, *rxd;
uint8_t rxval;
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
rc = EINVAL;
@@ -847,23 +781,23 @@ hal_spi_txrx(int spi_num, void *txbuf, void *rxbuf, int len)
goto err;
}
- p_spi = (NRF_SPI_Type *) spi->nhs_spi.spim.p_registers;
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
+ spim = (NRF_SPI_Type *) spi->nhs_spi.spim;
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
/* Blocking spi transfer */
txd = (uint8_t *)txbuf;
- hal_spi_master_send_first(p_spi, txd[0]);
+ hal_spi_master_send_first(spim, txd[0]);
txcnt = len - 1;
rxd = (uint8_t *)rxbuf;
for (i = 0; i < len; ++i) {
if (txcnt) {
++txd;
- nrf_spi_txd_set(p_spi, *txd);
+ spim->TXD = *txd;
--txcnt;
}
- while (!nrf_spi_event_check(p_spi, NRF_SPI_EVENT_READY)) {}
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
- rxval = nrf_spi_rxd_get(p_spi);
+ while (!spim->EVENTS_READY) {}
+ spim->EVENTS_READY = 0;
+ rxval = spim->RXD;
if (rxbuf) {
*rxd = rxval;
++rxd;
@@ -913,7 +847,7 @@ hal_spi_txrx_noblock(int spi_num, void *txbuf, void *rxbuf, int len)
{
int rc;
uint8_t *txd;
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
rc = EINVAL;
@@ -935,22 +869,22 @@ hal_spi_txrx_noblock(int spi_num, void *txbuf, void *rxbuf, int len)
goto err;
}
- p_spi = (NRF_SPI_Type *) spi->nhs_spi.spim.p_registers;
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
- spi->spi_xfr_flag = 1;
+ spim = (NRF_SPI_Type *) spi->nhs_spi.spim;
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
+ spi->spi_xfr_flag = 1;
spi->nhs_buflen = (uint16_t)len;
spi->nhs_txbuf = txbuf;
spi->nhs_rxbuf = rxbuf;
spi->nhs_rxd_bytes = 0;
txd = (uint8_t *)txbuf;
- hal_spi_master_send_first(p_spi, txd[0]);
+ hal_spi_master_send_first(spim, txd[0]);
spi->nhs_txd_bytes = 1;
if (len > 1) {
- nrf_spi_txd_set(p_spi, txd[1]);
+ spim->TXD = txd[1];
++spi->nhs_txd_bytes;
}
- nrf_spi_int_enable(p_spi, NRF_SPI_INT_READY_MASK);
+ spim->INTENSET = SPI_INTENSET_READY_Msk;
} else {
/* Must have txbuf or rxbuf */
if ((txbuf == NULL) && (rxbuf == NULL)) {
@@ -976,7 +910,7 @@ hal_spi_txrx_noblock(int spi_num, void *txbuf, void *rxbuf, int len)
spi->nhs_txbuf = txbuf;
spi->nhs_buflen = len;
spi->slave_state = HAL_SPI_SLAVE_STATE_ACQ_SEM;
- nrf_spis_task_trigger(spi->nhs_spi.spis.p_reg, NRF_SPIS_TASK_ACQUIRE);
+ spi->nhs_spi.spis->TASKS_ACQUIRE = 1;
}
return 0;
@@ -995,14 +929,14 @@ int
hal_spi_slave_set_def_tx_val(int spi_num, uint16_t val)
{
int rc;
- NRF_SPIS_Type *p_spis;
+ NRF_SPIS_Type *spis;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
if (spi->spi_type == HAL_SPI_TYPE_SLAVE) {
- p_spis = spi->nhs_spi.spis.p_reg;
- nrf_spis_def_set(p_spis, (uint8_t) val);
- nrf_spis_orc_set(p_spis, (uint8_t) val);
+ spis = spi->nhs_spi.spis;
+ spis->DEF = (uint8_t)val;
+ spis->ORC = (uint8_t)val;
rc = 0;
} else {
rc = EINVAL;
@@ -1025,20 +959,20 @@ int
hal_spi_abort(int spi_num)
{
int rc;
- NRF_SPI_Type *p_spi;
+ NRF_SPI_Type *spim;
struct nrf51_hal_spi *spi;
NRF51_HAL_SPI_RESOLVE(spi_num, spi);
rc = 0;
if (spi->spi_type == HAL_SPI_TYPE_MASTER) {
- p_spi = (NRF_SPI_Type *)spi->nhs_spi.spim.p_registers;
+ spim = (NRF_SPI_Type *)spi->nhs_spi.spim;
if (spi->spi_xfr_flag) {
- nrf_spi_int_disable(p_spi, NRF_SPI_INT_READY_MASK);
- nrf_spi_disable(p_spi);
- nrf_spi_event_clear(p_spi, NRF_SPI_EVENT_READY);
+ spim->INTENCLR = SPI_INTENCLR_READY_Msk;
+ spim->ENABLE = 0;
+ spim->EVENTS_READY = 0;
spi->spi_xfr_flag = 0;
- nrf_spi_int_enable(p_spi, NRF_SPI_INT_READY_MASK);
+ spim->INTENSET = SPI_INTENSET_READY_Msk;
}
} else {
/* Only way I can see doing this is to disable, then re-enable */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/4fcb950c/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
----------------------------------------------------------------------
diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
index 377dc9c..26a4343 100755
--- a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
+++ b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
@@ -54,6 +54,14 @@ struct nrf52_hal_i2c_cfg {
struct hal_flash;
extern const struct hal_flash nrf52k_flash_dev;
+/* SPI configuration (used for both master and slave) */
+struct nrf52_hal_spi_cfg {
+ uint8_t sck_pin;
+ uint8_t mosi_pin;
+ uint8_t miso_pin;
+ uint8_t ss_pin;
+};
+
#ifdef __cplusplus
}
#endif