Revert "Initial commit"

This reverts commit dec6e36.

Author: mjwinney

components/storage/blockdevice/COMPONENT_SPIF/mbed_lib.json

@@ -31,12 +31,6 @@
             "SPI_CLK":  "p19",
             "SPI_CS":   "p17"
         },
-        "NRF52840_FEATHER": {
-            "SPI_MOSI": "p20",
-            "SPI_MISO": "p21",
-            "SPI_CLK":  "p19",
-            "SPI_CS":   "p17"
-        },
         "HEXIWEAR": {
              "SPI_MOSI": "PTD6",
              "SPI_MISO": "PTD7",

drivers/SPI.h

@@ -112,9 +112,8 @@ 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, PinName dcx = NC);
+    SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel = NC);
 
     /** Create a SPI master connected to the specified pins.
      *
@@ -132,23 +131,6 @@ 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.
@@ -176,7 +158,6 @@ 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();
@@ -442,12 +423,9 @@ class SPI : private NonCopyable<SPI> {
     PinName _miso;
     PinName _sclk;
     PinName _hw_ssel;
-    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

@@ -28,17 +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, PinName dcx) :
+SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel) :
 #if DEVICE_SPI_ASYNCH
     _irq(this),
 #endif
     _mosi(mosi),
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(ssel),
-    _hw_dcx(dcx),
     _sw_ssel(NC),
-    _sw_dcx(NC),
     _static_pinmap(NULL),
     _init_func(_do_init)
 {
@@ -60,32 +58,7 @@ SPI::SPI(PinName mosi, PinName miso, PinName sclk, PinName ssel, use_gpio_ssel_t
     _miso(miso),
     _sclk(sclk),
     _hw_ssel(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)
 {
@@ -106,9 +79,7 @@ SPI::SPI(const spi_pinmap_t &pinmap) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(pinmap.ssel_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)
@@ -125,27 +96,7 @@ SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel) :
     _miso(pinmap.miso_pin),
     _sclk(pinmap.sclk_pin),
     _hw_ssel(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)
@@ -155,7 +106,7 @@ SPI::SPI(const spi_pinmap_t &pinmap, PinName ssel, PinName dcx) :
 
 void SPI::_do_init(SPI *obj)
 {
-    spi_init(&obj->_peripheral->spi, obj->_mosi, obj->_miso, obj->_sclk, obj->_hw_ssel, obj->_hw_dcx);
+    spi_init(&obj->_peripheral->spi, obj->_mosi, obj->_miso, obj->_sclk, obj->_hw_ssel);
 }
 
 void SPI::_do_init_direct(SPI *obj)

hal/spi_api.h

@@ -63,8 +63,6 @@ typedef struct {
     int sclk_function;
     PinName ssel_pin;
     int ssel_function;
-    PinName dcx_pin;
-    int dcx_function;
 } spi_pinmap_t;
 
 /**
@@ -187,9 +185,8 @@ 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, PinName dcx);
+void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel);
 
 /** Release a SPI object
  *
@@ -328,15 +325,6 @@ 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
@@ -373,15 +361,6 @@ 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, pinmap->dcx_pin);
+    spi_init(obj, pinmap->mosi_pin, pinmap->miso_pin, pinmap->sclk_pin, pinmap->ssel_pin);
 }
 #endif
 

platform/mbed_lib.json

@@ -212,10 +212,6 @@
             "crash-capture-enabled": true,
             "fatal-error-auto-reboot-enabled": true
         },
-        "NRF52840_FEATHER": {
-            "crash-capture-enabled": true,
-            "fatal-error-auto-reboot-enabled": true
-        },
         "NUCLEO_L476RG": {
             "crash-capture-enabled": true,
             "fatal-error-auto-reboot-enabled": true