Merge branch 'nordic_sdk_integration' of https://github.com/ARMmbed/mbed-nordic into nordic_sdk_integration

Author: nvlsianpu

hal/targets.json

@@ -1375,7 +1375,7 @@
         "supported_form_factors": ["ARDUINO"],
         "inherits": ["MCU_NRF51_32K"],
         "progen": {"target": "nrf51-dk"},
-        "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH"]
+        "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"]
     },
     "NRF51_DK_BOOT": {
         "supported_form_factors": ["ARDUINO"],
@@ -1773,6 +1773,6 @@
             "NRF52_PAN_62",
             "NRF52_PAN_63"
         ],
-        "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH"]
+        "device_has": ["ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"]
     }
 }

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF51822/sdk/nrf_drv_config.h

@@ -228,7 +228,7 @@
 #define PWM_COUNT   (PWM0_ENABLED + PWM1_ENABLED + PWM2_ENABLED)
 
 /* SPI */
-#define SPI0_ENABLED 1
+#define SPI0_ENABLED 0
 
 #if (SPI0_ENABLED == 1)
 #define SPI0_USE_EASY_DMA 0
@@ -281,7 +281,7 @@
 #define SPIS0_INSTANCE_INDEX 0
 #endif
 
-#define SPIS1_ENABLED 0
+#define SPIS1_ENABLED 1
 
 #if (SPIS1_ENABLED == 1)
 #define SPIS1_CONFIG_SCK_PIN         2

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/TARGET_MCU_NRF52832/sdk/nrf_drv_config.h

@@ -254,7 +254,7 @@
 #define SPI1_INSTANCE_INDEX (SPI0_ENABLED)
 #endif
 
-#define SPI2_ENABLED 0
+#define SPI2_ENABLED 1
 
 #if (SPI2_ENABLED == 1)
 #define SPI2_USE_EASY_DMA 0
@@ -270,7 +270,7 @@
 #define SPI_COUNT   (SPI0_ENABLED + SPI1_ENABLED + SPI2_ENABLED)
 
 /* SPIS */
-#define SPIS0_ENABLED 0
+#define SPIS0_ENABLED 1
 
 #if (SPIS0_ENABLED == 1)
 #define SPIS0_CONFIG_SCK_PIN         2
@@ -281,7 +281,7 @@
 #define SPIS0_INSTANCE_INDEX 0
 #endif
 
-#define SPIS1_ENABLED 0
+#define SPIS1_ENABLED 1
 
 #if (SPIS1_ENABLED == 1)
 #define SPIS1_CONFIG_SCK_PIN         2
@@ -292,7 +292,7 @@
 #define SPIS1_INSTANCE_INDEX SPIS0_ENABLED
 #endif
 
-#define SPIS2_ENABLED 0
+#define SPIS2_ENABLED 1
 
 #if (SPIS2_ENABLED == 1)
 #define SPIS2_CONFIG_SCK_PIN         2

hal/targets/hal/TARGET_NORDIC/TARGET_NRF5/objects.h

@@ -21,8 +21,6 @@
 #include "PeripheralNames.h"
 #include "PinNames.h"
 
-#include "nrf_drv_spi.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -31,9 +29,7 @@ struct serial_s {
 };
 
 struct spi_s {
-    nrf_drv_spi_t *p_spi;
-    volatile bool busy;
-    bool async_mode;
+    uint8_t spi_idx;
 };
 
 struct port_s {