more dcx

Author: mjwinney

drivers/SPI.h

@@ -132,6 +132,23 @@ class SPI : private NonCopyable<SPI> {
      */
     SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, use_gpio_ssel_t);
 
+    /** Create a SPI master connected to the specified pins.
+     *
+     *  @note This constructor manipulates the SSEL/DCX pin as a GPIO output
+     *  using a DigitalOut object. This should work on any target, and permits
+     *  the use of select() and deselect() methods to keep the pin asserted
+     *  between transfers.
+     *
+     *  @note You can specify mosi or miso as NC if not used.
+     *
+     *  @param mosi SPI Master Out, Slave In pin.
+     *  @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, PinName dcx, use_gpio_ssel_t);
+
     /** Create a SPI master connected to the specified pins.
      *
      *  @note This constructor passes the SSEL pin selection to the target HAL.
@@ -159,6 +176,7 @@ class SPI : private NonCopyable<SPI> {
      *  @param ssel SPI Chip Select pin.
      */
     SPI(const spi_pinmap_t &static_pinmap, PinName ssel);
+    SPI(const spi_pinmap_t &pinmap, PinName ssel, PinName dcx);
     SPI(const spi_pinmap_t &&, PinName) = delete; // prevent passing of temporary objects
 
     virtual ~SPI();
@@ -424,10 +442,12 @@ class SPI : private NonCopyable<SPI> {
     PinName _miso;
     PinName _sclk;
     PinName _hw_ssel;
-    PinName _dcx;
+    PinName _hw_dcx;
 
     // The Slave Select GPIO if we're doing it ourselves.
     DigitalOut _sw_ssel;
+    // The Data Command GPIO if we're doing it ourselves.
+    DigitalOut _sw_dcx;
 
     /* Size of the SPI frame */
     int _bits;

drivers/source/SPI.cpp

@@ -36,8 +36,9 @@ SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName dcx) :
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(ssel),
-    _dcx(dcx),
+    _hw_dcx(dcx),
     _sw_ssel(NC),
+    _sw_dcx(NC),
     _static_pinmap(NULL),
     _init_func(_do_init)
 {
@@ -59,8 +60,32 @@ SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, use_gpio_ssel_t
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(NC),
-    _dcx(NC),
+    _hw_dcx(NC),
     _sw_ssel(ssel, 1),
+    _sw_dcx(NC),
+    _static_pinmap(NULL),
+    _init_func(_do_init)
+{
+    // Need backwards compatibility with HALs not providing API
+#ifdef DEVICE_SPI_COUNT
+    _peripheral_name = spi_get_peripheral_name(_mosi, _miso, _sclk);
+#else
+    _peripheral_name = GlobalSPI;
+#endif
+    _do_construct();
+}
+
+SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, PinName dcx, use_gpio_ssel_t) :
+#if DEVICE_SPI_ASYNCH
+    _irq(this),
+#endif
+    _mosi(mosi),
+    _miso(miso),
+    _sclk(sclk),
+    _hw_ssel(NC),
+    _hw_dcx(NC),
+    _sw_ssel(ssel, 1),
+    _sw_dcx(dcx, 1),
     _static_pinmap(NULL),
     _init_func(_do_init)
 {
@@ -81,8 +106,9 @@ SPI::SPI(const spi_pinmap_t &pinmap) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(pinmap.ssel_pin),
-    _dcx(pinmap.dcx_pin),
+    _hw_dcx(pinmap.dcx_pin),
     _sw_ssel(NC),
+    _sw_dcx(NC),
     _static_pinmap(&pinmap),
     _peripheral_name((SPIName)pinmap.peripheral),
     _init_func(_do_init_direct)
@@ -99,8 +125,27 @@ SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(NC),
-    _dcx(NC),
+    _hw_dcx(NC),
+    _sw_ssel(ssel, 1),
+    _sw_dcx(NC),
+    _static_pinmap(&pinmap),
+    _peripheral_name((SPIName)pinmap.peripheral),
+    _init_func(_do_init_direct)
+{
+    _do_construct();
+}
+
+SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel, PinName dcx) :
+#if DEVICE_SPI_ASYNCH
+    _irq(this),
+#endif
+    _mosi(pinmap.mosi_pin),
+    _miso(pinmap.miso_pin),
+    _sclk(pinmap.sclk_pin),
+    _hw_ssel(NC),
+    _hw_dcx(NC),
     _sw_ssel(ssel, 1),
+    _sw_dcx(dcx, 1),
     _static_pinmap(&pinmap),
     _peripheral_name((SPIName)pinmap.peripheral),
     _init_func(_do_init_direct)
@@ -110,7 +155,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, obj->_dcx);
+    spi_init(&obj->_peripheral->spi, obj->_mosi, obj->_miso, obj->_sclk, obj->_hw_ssel, obj->_hw_dcx);
 }
 
 void SPI::_do_init_direct(SPI *obj)