nrf: Add a nrfx submodule and prepare for using the new drivers

arturo182 · arturo182 · commit 5509f394dcef · 2018-06-20T20:43:59.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -70,3 +70,6 @@
 [submodule "ports/atmel-samd/peripherals"]
 	path = ports/atmel-samd/peripherals
 	url = https://github.com/adafruit/samd-peripherals.git
+[submodule "ports/nrf/nrfx"]
+	path = ports/nrf/nrfx
+	url = https://github.com/NordicSemiconductor/nrfx.git
diff --git a/ports/nrf/Makefile b/ports/nrf/Makefile
@@ -42,8 +42,6 @@ FATFS_DIR = lib/oofatfs
 
 CROSS_COMPILE = arm-none-eabi-
 
-MCU_VARIANT_UPPER = $(shell echo $(MCU_VARIANT) | tr '[:lower:]' '[:upper:]')
-
 INC += -I.
 INC += -I../..
 INC += -I$(BUILD)
@@ -63,7 +61,6 @@ INC += -I../../lib/mp-readline
 INC += -I./drivers/bluetooth
 INC += -I./drivers
 
-NRF_DEFINES += -D$(MCU_VARIANT_UPPER)
 NRF_DEFINES += -DCONFIG_GPIO_AS_PINRESET
 
 CFLAGS += -mthumb -mabi=aapcs -fsingle-precision-constant -Wdouble-promotion
@@ -73,6 +70,7 @@ CFLAGS += -fno-strict-aliasing
 CFLAGS += -fstack-usage
 CFLAGS += -fdata-sections -ffunction-sections
 CFLAGS += -DNRF5_HAL_H='<$(MCU_VARIANT)_hal.h>'
+CFLAGS += -D__START=main
 
 LDFLAGS = $(CFLAGS)
 LDFLAGS += -Xlinker -Map=$(@:.elf=.map)
@@ -125,7 +123,7 @@ SRC_C += \
 	drivers/bluetooth/ble_drv.c \
 	drivers/bluetooth/ble_uart.c \
 	boards/$(BOARD)/board.c \
-	device/$(MCU_VARIANT)/system_$(MCU_SUB_VARIANT).c \
+	nrfx/mdk/system_$(MCU_SUB_VARIANT).c \
 	device/$(MCU_VARIANT)/startup_$(MCU_SUB_VARIANT).c \
 	lib/oofatfs/ff.c \
 	lib/oofatfs/option/ccsbcs.c \
diff --git a/ports/nrf/boards/feather52832/mpconfigboard.mk b/ports/nrf/boards/feather52832/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52832
+MCU_SUB_VARIANT = nrf52
 SOFTDEV_VERSION ?= 2.0.1
 
 LD_FILE = boards/feather52832/custom_nrf52832_dfu_app_$(SOFTDEV_VERSION).ld
diff --git a/ports/nrf/boards/pca10040/mpconfigboard.mk b/ports/nrf/boards/pca10040/mpconfigboard.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52832
+MCU_SUB_VARIANT = nrf52
 LD_FILE = boards/nrf52832_512k_64k.ld
 
 NRF_DEFINES += -DNRF52832_XXAA
diff --git a/ports/nrf/boards/pca10040/mpconfigboard_s132.mk b/ports/nrf/boards/pca10040/mpconfigboard_s132.mk
@@ -1,6 +1,6 @@
 MCU_SERIES = m4
 MCU_VARIANT = nrf52
-MCU_SUB_VARIANT = nrf52832
+MCU_SUB_VARIANT = nrf52
 SOFTDEV_VERSION = 5.0.0
 
 LD_FILE = boards/nrf52832_512k_64k_s132_$(SOFTDEV_VERSION).ld
diff --git a/ports/nrf/device/nrf52/startup_nrf52.c b/ports/nrf/device/nrf52/startup_nrf52.c
diff --git a/ports/nrf/drivers/bluetooth/ble_drv.c b/ports/nrf/drivers/bluetooth/ble_drv.c
@@ -30,6 +30,8 @@
 #include <string.h>
 #include <stdbool.h>
 
+#define NRF52 // Needed for SD132 v2
+
 #include "py/runtime.h"
 #include "ble_drv.h"
 #include "mpconfigport.h"
diff --git a/ports/nrf/hal/hal_gpio.c b/ports/nrf/hal/hal_gpio.c
@@ -94,7 +94,7 @@ void GPIOTE_IRQHandler(void) {
         GPIOTE_BASE->EVENTS_IN[3] = 0;
         m_callback(HAL_GPIO_EVENT_CHANNEL_3);
     }
-#if NRF52
+
     if (GPIOTE_BASE->EVENTS_IN[4]) {
         GPIOTE_BASE->EVENTS_IN[4] = 0;
         m_callback(HAL_GPIO_EVENT_CHANNEL_4);
@@ -111,7 +111,6 @@ void GPIOTE_IRQHandler(void) {
         GPIOTE_BASE->EVENTS_IN[7] = 0;
         m_callback(HAL_GPIO_EVENT_CHANNEL_7);
     }
-#endif
 }
 
 #endif // if 0
diff --git a/ports/nrf/hal/hal_gpio.h b/ports/nrf/hal/hal_gpio.h
@@ -29,18 +29,12 @@
 
 #include "nrf.h"
 
-#if NRF51
-  #define POINTERS (const uint32_t[]){NRF_GPIO_BASE}
+#ifdef NRF52832_XXAA
+  #define POINTERS (const uint32_t[]){NRF_P0_BASE}
 #endif
 
-#if NRF52
-  #ifdef NRF52832_XXAA
-    #define POINTERS (const uint32_t[]){NRF_P0_BASE}
-  #endif
-
-  #ifdef NRF52840_XXAA
-    #define POINTERS (const uint32_t[]){NRF_P0_BASE, NRF_P1_BASE}
-  #endif
+#ifdef NRF52840_XXAA
+  #define POINTERS (const uint32_t[]){NRF_P0_BASE, NRF_P1_BASE}
 #endif
 
 #define GPIO_BASE(x) ((NRF_GPIO_Type *)POINTERS[x])
@@ -133,12 +127,10 @@ typedef enum {
     HAL_GPIO_EVENT_CHANNEL_1,
     HAL_GPIO_EVENT_CHANNEL_2,
     HAL_GPIO_EVENT_CHANNEL_3,
-#if NRF52
     HAL_GPIO_EVENT_CHANNEL_4,
     HAL_GPIO_EVENT_CHANNEL_5,
     HAL_GPIO_EVENT_CHANNEL_6,
     HAL_GPIO_EVENT_CHANNEL_7
-#endif
 } hal_gpio_event_channel_t;
 
 typedef struct {
diff --git a/ports/nrf/hal/hal_irq.h b/ports/nrf/hal/hal_irq.h
@@ -37,11 +37,8 @@
 
 #define BLUETOOTH_STACK_ENABLED() (ble_drv_stack_enabled())
 
-#ifdef NRF51
-  #include "nrf_soc.h"
-#elif defined(NRF52)
-  #include "nrf_nvic.h"
-#endif
+#define NRF52
+#include "nrf_nvic.h"
 #endif // BLUETOOTH_SD
 
 static inline void hal_irq_clear(uint32_t irq_num) {
diff --git a/ports/nrf/hal/hal_pwm.h b/ports/nrf/hal/hal_pwm.h
@@ -31,26 +31,18 @@
 
 #include "nrf.h"
 
-// TODO: nrf51 series need Soft PWM. Not part of HAL.
-
-#if NRF52
-
 #define PWM0  ((NRF_PWM_Type *)NRF_PWM0_BASE)
 #define PWM0_IRQ_NUM PWM1_IRQn
 #define PWM1  ((NRF_PWM_Type *)NRF_PWM1_BASE)
 #define PWM1_IRQ_NUM PWM1_IRQn
 #define PWM2  ((NRF_PWM_Type *)NRF_PWM2_BASE)
 #define PWM2_IRQ_NUM PWM2_IRQn
 
-#if 0 // TODO: nrf52840
+#ifdef NRF52840_XXAA
 #define PWM3  ((NRF_PWM_Type *)NRF_PWM3_BASE)
 #define PWM3_IRQ_NUM PWM3_IRQn
 #endif
 
-#else
-#error "Device not supported."
-#endif
-
 /**
   * @brief  PWM frequency type definition
   */
diff --git a/ports/nrf/hal/hal_rtc.c b/ports/nrf/hal/hal_rtc.c
@@ -110,14 +110,10 @@ void RTC1_IRQHandler(void)
     common_irq_handler(1);
 }
 
-#if NRF52
-
 void RTC2_IRQHandler(void)
 {
     common_irq_handler(2);
 }
 
-#endif // NRF52
-
 #endif // HAL_RTC_MODULE_ENABLED
 
diff --git a/ports/nrf/hal/hal_rtc.h b/ports/nrf/hal/hal_rtc.h
@@ -29,21 +29,12 @@
 
 #include "nrf.h"
 
-#if NRF51
-  #define RTC_BASE_POINTERS (const uint32_t[]){NRF_RTC0_BASE, \
-                                               NRF_RTC1_BASE}
-  #define RTC_IRQ_VALUES (const uint32_t[]){RTC0_IRQn, \
-                                            RTC1_IRQn}
-#endif
-
-#if NRF52
-  #define RTC_BASE_POINTERS (const uint32_t[]){NRF_RTC0_BASE, \
-                                               NRF_RTC1_BASE, \
-                                               NRF_RTC2_BASE}
-  #define RTC_IRQ_VALUES (const uint32_t[]){RTC0_IRQn, \
-                                            RTC1_IRQn, \
-                                            RTC2_IRQn}
-#endif
+#define RTC_BASE_POINTERS (const uint32_t[]){NRF_RTC0_BASE, \
+                                             NRF_RTC1_BASE, \
+                                             NRF_RTC2_BASE}
+#define RTC_IRQ_VALUES (const uint32_t[]){RTC0_IRQn, \
+                                          RTC1_IRQn, \
+                                          RTC2_IRQn}
 
 #define RTC_BASE(x) ((NRF_RTC_Type *)RTC_BASE_POINTERS[x])
 #define RTC_IRQ_NUM(x) (RTC_IRQ_VALUES[x])
diff --git a/ports/nrf/hal/hal_spi.h b/ports/nrf/hal/hal_spi.h
@@ -30,31 +30,24 @@
 #include <stdbool.h>
 #include "nrf.h"
 
-#if NRF51
-  #define SPI_BASE_POINTERS (const uint32_t[]){NRF_SPI0_BASE, NRF_SPI1_BASE}
-  #define SPI_IRQ_VALUES (const uint32_t[]){SPI0_TWI0_IRQn, SPI1_TWI1_IRQn}
+#ifdef NRF52832_XXAA
+  #define SPI_BASE_POINTERS (const uint32_t[]){NRF_SPI0_BASE, \
+                                               NRF_SPI1_BASE, \
+                                               NRF_SPI2_BASE}
+  #define SPI_IRQ_VALUES (const uint32_t[]){SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, \
+                                            SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn, \
+                                            SPIM2_SPIS2_SPI2_IRQn}
 #endif
 
-#if NRF52
-  #ifdef NRF52832_XXAA
-    #define SPI_BASE_POINTERS (const uint32_t[]){NRF_SPI0_BASE, \
-                                                 NRF_SPI1_BASE, \
-                                                 NRF_SPI2_BASE}
-    #define SPI_IRQ_VALUES (const uint32_t[]){SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, \
-                                              SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn, \
-                                              SPIM2_SPIS2_SPI2_IRQn}
-  #endif
-
-  #ifdef NRF52840_XXAA
-    #define SPI_BASE_POINTERS (const uint32_t[]){NRF_SPI0_BASE, \
-                                                 NRF_SPI1_BASE, \
-                                                 NRF_SPI2_BASE, \
-                                                 NRF_SPIM3_BASE}
-    #define SPI_IRQ_VALUES (const uint32_t[]){SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, \
-                                              SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn, \
-                                              SPIM2_SPIS2_SPI2_IRQn, \
-                                              SPIM3_IRQn}
-  #endif
+#ifdef NRF52840_XXAA
+  #define SPI_BASE_POINTERS (const uint32_t[]){NRF_SPI0_BASE, \
+                                               NRF_SPI1_BASE, \
+                                               NRF_SPI2_BASE, \
+                                               NRF_SPIM3_BASE}
+  #define SPI_IRQ_VALUES (const uint32_t[]){SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, \
+                                            SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn, \
+                                            SPIM2_SPIS2_SPI2_IRQn, \
+                                            SPIM3_IRQn}
 #endif
 
 #define SPI_BASE(x) ((NRF_SPI_Type *)SPI_BASE_POINTERS[x])
diff --git a/ports/nrf/hal/hal_timer.c b/ports/nrf/hal/hal_timer.c
@@ -88,8 +88,6 @@ void TIMER2_IRQHandler(void) {
     common_irq_handler(2);
 }
 
-#if NRF52
-
 void TIMER3_IRQHandler(void) {
     common_irq_handler(3);
 }
@@ -98,6 +96,4 @@ void TIMER4_IRQHandler(void) {
     common_irq_handler(4);
 }
 
-#endif
-
 #endif // HAL_TIMER_MODULE_ENABLED
diff --git a/ports/nrf/hal/hal_timer.h b/ports/nrf/hal/hal_timer.h
@@ -29,27 +29,16 @@
 
 #include "nrf.h"
 
-#if NRF51
-  #define TIMER_BASE_POINTERS (const uint32_t[]){NRF_TIMER0_BASE, \
-                                                 NRF_TIMER1_BASE, \
-                                                 NRF_TIMER2_BASE}
-  #define TIMER_IRQ_VALUES (const uint32_t[]){TIMER0_IRQn, \
-                                              TIMER1_IRQn, \
-                                              TIMER2_IRQn}
-#endif
-
-#if NRF52
-  #define TIMER_BASE_POINTERS (const uint32_t[]){NRF_TIMER0_BASE, \
-                                                 NRF_TIMER1_BASE, \
-                                                 NRF_TIMER1_BASE, \
-                                                 NRF_TIMER1_BASE, \
-                                                 NRF_TIMER2_BASE}
-  #define TIMER_IRQ_VALUES (const uint32_t[]){TIMER0_IRQn, \
+#define TIMER_BASE_POINTERS (const uint32_t[]){NRF_TIMER0_BASE, \
+                                               NRF_TIMER1_BASE, \
+                                               NRF_TIMER1_BASE, \
+                                               NRF_TIMER1_BASE, \
+                                               NRF_TIMER2_BASE}
+#define TIMER_IRQ_VALUES (const uint32_t[]){TIMER0_IRQn, \
                                               TIMER1_IRQn, \
                                               TIMER2_IRQn, \
                                               TIMER3_IRQn, \
                                               TIMER4_IRQn}
-#endif
 
 #define TIMER_BASE(x) ((NRF_TIMER_Type *)TIMER_BASE_POINTERS[x])
 #define TIMER_IRQ_NUM(x) (TIMER_IRQ_VALUES[x])
diff --git a/ports/nrf/hal/hal_twi.h b/ports/nrf/hal/hal_twi.h
@@ -32,20 +32,9 @@
 
 #define TWI_BASE_POINTERS (const uint32_t[]){NRF_TWI0_BASE, NRF_TWI1_BASE}
 #define TWI_BASE(x) ((NRF_TWI_Type *)TWI_BASE_POINTERS[x])
-
-#if NRF51
-
-#define TWI_IRQ_VALUES (const uint32_t[]){SPI0_TWI0_IRQn, SPI1_TWI1_IRQn}
-
-#elif NRF52
-
 #define TWI_IRQ_VALUES (const uint32_t[]){SPIM0_SPIS0_TWIM0_TWIS0_SPI0_TWI0_IRQn, \
                                           SPIM1_SPIS1_TWIM1_TWIS1_SPI1_TWI1_IRQn}
 
-#endif
-
-#if NRF52
-
 /**
   * @brief  TWIM Configuration Structure definition
   */
@@ -58,8 +47,6 @@ typedef struct {
 typedef struct {
 } hal_twis_init_t;
 
-#endif
-
 /**
   * @brief  TWI clock frequency type definition
   */
diff --git a/ports/nrf/hal/hal_uart.h b/ports/nrf/hal/hal_uart.h
@@ -32,37 +32,24 @@
 
 #include "nrf.h"
 
-#if NRF51
-  #define UART_HWCONTROL_NONE                  ((uint32_t)UART_CONFIG_HWFC_Disabled << UART_CONFIG_HWFC_Pos)
-  #define UART_HWCONTROL_RTS_CTS               ((uint32_t)(UART_CONFIG_HWFC_Enabled << UART_CONFIG_HWFC_Pos)
-  #define IS_UART_HARDWARE_FLOW_CONTROL(CONTROL)\
-                              (((CONTROL) == UART_HWCONTROL_NONE) || \
-                               ((CONTROL) == UART_HWCONTROL_RTS_CTS))
+#define UART_HWCONTROL_NONE                  ((uint32_t)UARTE_CONFIG_HWFC_Disabled << UARTE_CONFIG_HWFC_Pos)
+#define UART_HWCONTROL_RTS_CTS               ((uint32_t)(UARTE_CONFIG_HWFC_Enabled << UARTE_CONFIG_HWFC_Pos)
+#define IS_UART_HARDWARE_FLOW_CONTROL(CONTROL)\
+                            (((CONTROL) == UART_HWCONTROL_NONE) || \
+                             ((CONTROL) == UART_HWCONTROL_RTS_CTS))
+#ifdef HAL_UART_MODULE_ENABLED
   #define UART_BASE_POINTERS (const uint32_t[]){NRF_UART0_BASE}
-  #define UART_IRQ_VALUES (const uint32_t[]){UART0_IRQn}
-
-#elif NRF52
-  #define UART_HWCONTROL_NONE                  ((uint32_t)UARTE_CONFIG_HWFC_Disabled << UARTE_CONFIG_HWFC_Pos)
-  #define UART_HWCONTROL_RTS_CTS               ((uint32_t)(UARTE_CONFIG_HWFC_Enabled << UARTE_CONFIG_HWFC_Pos)
-  #define IS_UART_HARDWARE_FLOW_CONTROL(CONTROL)\
-                              (((CONTROL) == UART_HWCONTROL_NONE) || \
-                               ((CONTROL) == UART_HWCONTROL_RTS_CTS))
-  #ifdef HAL_UART_MODULE_ENABLED
-    #define UART_BASE_POINTERS (const uint32_t[]){NRF_UART0_BASE}
+  #define UART_IRQ_VALUES (const uint32_t[]){UARTE0_UART0_IRQn}
+#else // HAL_UARTE_MODULE_ENABLED
+  #ifdef NRF52832_XXAA
+    #define UART_BASE_POINTERS (const uint32_t[]){NRF_UARTE0_BASE}
     #define UART_IRQ_VALUES (const uint32_t[]){UARTE0_UART0_IRQn}
-  #else // HAL_UARTE_MODULE_ENABLED
-    #ifdef NRF52832_XXAA
-      #define UART_BASE_POINTERS (const uint32_t[]){NRF_UARTE0_BASE}
-      #define UART_IRQ_VALUES (const uint32_t[]){UARTE0_UART0_IRQn}
-    #elif NRF52840_XXAA
-      #define UART_BASE_POINTERS (const uint32_t[]){NRF_UARTE0_BASE, \
-                                                    NRF_UARTE1_BASE}
-      #define UART_IRQ_VALUES (const uint32_t[]){UARTE0_UART0_IRQn, \
-                                                 UARTE1_IRQn}
-    #endif // HAL_UARTE_MODULE_ENABLED
-  #endif
-#else
-#error "Device not supported."
+  #elif NRF52840_XXAA
+    #define UART_BASE_POINTERS (const uint32_t[]){NRF_UARTE0_BASE, \
+                                                  NRF_UARTE1_BASE}
+    #define UART_IRQ_VALUES (const uint32_t[]){UARTE0_UART0_IRQn, \
+                                               UARTE1_IRQn}
+  #endif // HAL_UARTE_MODULE_ENABLED
 #endif
 
 #define UART_BASE(x) ((NRF_UART_Type *)UART_BASE_POINTERS[x])
diff --git a/ports/nrf/nrfx b/ports/nrf/nrfx
@@ -0,0 +1 @@
+Subproject commit 293f553ed9551c1fdfd05eac48e75bbdeb4e7290
diff --git a/ports/nrf/supervisor/port.c b/ports/nrf/supervisor/port.c

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ void GPIOTE_IRQHandler(void) {`
`94`	`94`	`GPIOTE_BASE->EVENTS_IN[3] = 0;`
`95`	`95`	`m_callback(HAL_GPIO_EVENT_CHANNEL_3);`
`96`	`96`	`}`
`97`		`-#if NRF52`
	`97`	`+`
`98`	`98`	`if (GPIOTE_BASE->EVENTS_IN[4]) {`
`99`	`99`	`GPIOTE_BASE->EVENTS_IN[4] = 0;`
`100`	`100`	`m_callback(HAL_GPIO_EVENT_CHANNEL_4);`
`@@ -111,7 +111,6 @@ void GPIOTE_IRQHandler(void) {`
`111`	`111`	`GPIOTE_BASE->EVENTS_IN[7] = 0;`
`112`	`112`	`m_callback(HAL_GPIO_EVENT_CHANNEL_7);`
`113`	`113`	`}`
`114`		`-#endif`
`115`	`114`	`}`
`116`	`115`
`117`	`116`	`#endif // if 0`