First stab at implement SPIM DCX

Author: mjwinney

drivers/SPI.h

@@ -112,8 +112,9 @@ class SPI : private NonCopyable<SPI> {
      *  @param miso SPI Master In, Slave Out pin.
      *  @param sclk SPI Clock pin.
      *  @param ssel SPI Chip Select pin.
+     *  @param dcx SPI Data/Command pin.
      */
-    SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel = NC);
+    SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel = NC, PinName dcx = NC);
 
     /** Create a SPI master connected to the specified pins.
      *
@@ -423,6 +424,7 @@ class SPI : private NonCopyable<SPI> {
     PinName _miso;
     PinName _sclk;
     PinName _hw_ssel;
+    PinName _dcx;
 
     // The Slave Select GPIO if we're doing it ourselves.
     DigitalOut _sw_ssel;

drivers/source/SPI.cpp

@@ -28,14 +28,15 @@ namespace mbed {
 SPI::spi_peripheral_s SPI::_peripherals[SPI_PERIPHERALS_USED];
 int SPI::_peripherals_used;
 
-SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel) :
+SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName dcx) :
 #if DEVICE_SPI_ASYNCH
     _irq(this),
 #endif
     _mosi(mosi),
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(ssel),
+    _dcx(dcx),
     _sw_ssel(NC),
     _static_pinmap(NULL),
     _init_func(_do_init)
@@ -58,6 +59,7 @@ SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, use_gpio_ssel_t
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(NC),
+    _dcx(NC),
     _sw_ssel(ssel, 1),
     _static_pinmap(NULL),
     _init_func(_do_init)
@@ -79,6 +81,7 @@ SPI::SPI(const spi_pinmap_t &pinmap) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(pinmap.ssel_pin),
+    _dcx(pinmap.dcx_pin),
     _sw_ssel(NC),
     _static_pinmap(&pinmap),
     _peripheral_name((SPIName)pinmap.peripheral),
@@ -96,6 +99,7 @@ SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(NC),
+    _dcx(NC),
     _sw_ssel(ssel, 1),
     _static_pinmap(&pinmap),
     _peripheral_name((SPIName)pinmap.peripheral),
@@ -106,7 +110,7 @@ SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel) :
 
 void SPI::_do_init(SPI *obj)
 {
-    spi_init(&obj->_peripheral->spi, obj->_mosi, obj->_miso, obj->_sclk, obj->_hw_ssel);
+    spi_init(&obj->_peripheral->spi, obj->_mosi, obj->_miso, obj->_sclk, obj->_hw_ssel, obj->_dcx);
 }
 
 void SPI::_do_init_direct(SPI *obj)

hal/spi_api.h

@@ -63,6 +63,8 @@ typedef struct {
     int sclk_function;
     PinName ssel_pin;
     int ssel_function;
+    PinName dcx_pin;
+    int dcx_function;
 } spi_pinmap_t;
 
 /**
@@ -185,8 +187,9 @@ void spi_init_direct(spi_t *obj, const spi_pinmap_t *pinmap);
  * @param[in]  miso The pin to use for MISO
  * @param[in]  sclk The pin to use for SCLK
  * @param[in]  ssel The pin to use for SSEL
+ * @param[in]  dcx  The pin to use for DC (Data/Command)  NC if not connected
  */
-void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel);
+void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName dcx);
 
 /** Release a SPI object
  *
@@ -325,6 +328,15 @@ const PinMap *spi_master_clk_pinmap(void);
  */
 const PinMap *spi_master_cs_pinmap(void);
 
+/** Get the pins that support SPI DC
+ *
+ * Return a PinMap array of pins that support SPI DC in
+ * master mode. The array is terminated with {NC, NC, 0}.
+ *
+ * @return PinMap array
+ */
+const PinMap *spi_master_dc_pinmap(void);
+
 /** Get the pins that support SPI MOSI
  *
  * Return a PinMap array of pins that support SPI MOSI in
@@ -361,6 +373,15 @@ const PinMap *spi_slave_clk_pinmap(void);
  */
 const PinMap *spi_slave_cs_pinmap(void);
 
+/** Get the pins that support SPI DC
+ *
+ * Return a PinMap array of pins that support SPI DC in
+ * slave mode. The array is terminated with {NC, NC, 0}.
+ *
+ * @return PinMap array
+ */
+const PinMap *spi_slave_dc_pinmap(void);
+
 /**@}*/
 
 #if DEVICE_SPI_ASYNCH

hal/static_pinmap.cpp

@@ -28,7 +28,7 @@
 #if DEVICE_SPI
 MBED_WEAK void spi_init_direct(spi_t *obj, const spi_pinmap_t *pinmap)
 {
-    spi_init(obj, pinmap->mosi_pin, pinmap->miso_pin, pinmap->sclk_pin, pinmap->ssel_pin);
+    spi_init(obj, pinmap->mosi_pin, pinmap->miso_pin, pinmap->sclk_pin, pinmap->ssel_pin, pinmap->dcx_pin);
 }
 #endif
 

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/config/sdk_config.h

@@ -3257,7 +3257,7 @@
 
 
 #ifndef NRFX_SPIM_EXTENDED_ENABLED
-#define NRFX_SPIM_EXTENDED_ENABLED 0
+#define NRFX_SPIM_EXTENDED_ENABLED 1
 #endif
 
 // <o> NRFX_SPIM_MISO_PULL_CFG  - MISO pin pull configuration.