Merge pull request #11632 from mprse/explicit_pinmap_gold_2

Add explicit pin-map support for extra targets

Author: 0xc0170

drivers/AnalogIn.h

@@ -72,6 +72,7 @@ class AnalogIn {
      * @param pinmap reference to structure which holds static pinmap.
      */
     AnalogIn(const PinMap &pinmap);
+    AnalogIn(const PinMap &&) = delete; // prevent passing of temporary objects
 
     /** Create an AnalogIn, connected to the specified pin
      *

drivers/AnalogOut.h

@@ -70,6 +70,7 @@ class AnalogOut {
      *
      * @param pinmap reference to structure which holds static pinmap.
      */
+    AnalogOut(const PinMap &&) = delete; // prevent passing of temporary objects
     AnalogOut(const PinMap &pinmap)
     {
         analogout_init_direct(&_dac, &pinmap);

drivers/CAN.h

@@ -170,6 +170,24 @@ class CAN : private NonCopyable<CAN> {
       */
     CAN(PinName rd, PinName td, int hz);
 
+    /** Initialize CAN interface
+      *
+      * @param pinmap reference to structure which holds static pinmap
+      * @param td the transmit pin
+      * @param hz the bus frequency in hertz
+      */
+    CAN(const can_pinmap_t &pinmap);
+    CAN(const can_pinmap_t &&) = delete; // prevent passing of temporary objects
+
+    /** Initialize CAN interface and set the frequency
+      *
+      * @param pinmap reference to structure which holds static pinmap
+      * @param td the transmit pin
+      * @param hz the bus frequency in hertz
+      */
+    CAN(const can_pinmap_t &pinmap, int hz);
+    CAN(const can_pinmap_t &&, int) = delete; // prevent passing of temporary objects
+
     virtual ~CAN();
 
     /** Set the frequency of the CAN interface
@@ -343,4 +361,3 @@ class CAN : private NonCopyable<CAN> {
 #endif
 
 #endif    // MBED_CAN_H
-

drivers/I2C.h

@@ -106,6 +106,7 @@ class I2C : private NonCopyable<I2C> {
      *  @param explicit_pinmap reference to structure which holds static pinmap.
      */
     I2C(const i2c_pinmap_t &explicit_pinmap);
+    I2C(const i2c_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Set the frequency of the I2C interface
      *

drivers/I2CSlave.h

@@ -91,6 +91,7 @@ class I2CSlave {
      *  @param explicit_pinmap reference to structure which holds static pinmap.
      */
     I2CSlave(const i2c_pinmap_t &explicit_pinmap);
+    I2CSlave(const i2c_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Set the frequency of the I2C interface.
      *

drivers/PwmOut.h

@@ -66,6 +66,7 @@ class PwmOut {
      *  @param pinmap reference to structure which holds static pinmap.
      */
     PwmOut(const PinMap &pinmap);
+    PwmOut(const PinMap &&) = delete; // prevent passing of temporary objects
 
     ~PwmOut();
 

drivers/QSPI.h

@@ -102,6 +102,19 @@ class QSPI : private NonCopyable<QSPI> {
      *
      */
     QSPI(PinName io0, PinName io1, PinName io2, PinName io3, PinName sclk, PinName ssel = NC, int mode = 0);
+
+    /** Create a QSPI master connected to the specified pins
+     *
+     *  io0-io3 is used to specify the Pins used for Quad SPI mode
+     *
+     *  @param pinmap reference to structure which holds static pinmap
+     *  @param mode Clock polarity and phase mode (0 - 3) of SPI
+     *         (Default: Mode=0 uses CPOL=0, CPHA=0, Mode=1 uses CPOL=1, CPHA=1)
+     *
+     */
+    QSPI(const qspi_pinmap_t &pinmap, int mode = 0);
+    QSPI(const qspi_pinmap_t &&, int = 0) = delete; // prevent passing of temporary objects
+
     virtual ~QSPI()
     {
     }
@@ -222,13 +235,16 @@ class QSPI : private NonCopyable<QSPI> {
     int _mode; //SPI mode
     bool _initialized;
     PinName _qspi_io0, _qspi_io1, _qspi_io2, _qspi_io3, _qspi_clk, _qspi_cs; //IO lines, clock and chip select
+    const qspi_pinmap_t *_explicit_pinmap;
+    bool (QSPI::* _init_func)(void);
 
 private:
     /* Private acquire function without locking/unlocking
      * Implemented in order to avoid duplicate locking and boost performance
      */
     bool _acquire(void);
     bool _initialize();
+    bool _initialize_direct();
 
     /*
      * This function builds the qspi command struct to be send to Hal

drivers/SPI.h

@@ -143,6 +143,7 @@ class SPI : private NonCopyable<SPI> {
      *  @param explicit_pinmap reference to structure which holds static pinmap.
      */
     SPI(const spi_pinmap_t &explicit_pinmap);
+    SPI(const spi_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Create a SPI master connected to the specified pins.
      *
@@ -157,6 +158,7 @@ class SPI : private NonCopyable<SPI> {
      *  @param ssel SPI Chip Select pin.
      */
     SPI(const spi_pinmap_t &explicit_pinmap, PinName ssel);
+    SPI(const spi_pinmap_t &&, PinName) = delete; // prevent passing of temporary objects
 
     virtual ~SPI();
 

drivers/SPISlave.h

@@ -78,6 +78,7 @@ class SPISlave : private NonCopyable<SPISlave> {
      *  @param explicit_pinmap reference to structure which holds static pinmap.
      */
     SPISlave(const spi_pinmap_t &pinmap);
+    SPISlave(const spi_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Configure the data transmission format.
      *

drivers/Serial.h

@@ -83,6 +83,7 @@ class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
      *    Either tx or rx may be specified as NC (Not Connected) if unused
      */
     Serial(const serial_pinmap_t &explicit_pinmap, const char *name = NULL, int baud = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE);
+    Serial(const serial_pinmap_t &&, const char * = NULL, int = MBED_CONF_PLATFORM_DEFAULT_SERIAL_BAUD_RATE) = delete; // prevent passing of temporary objects
 
     /** Create a Serial port, connected to the specified transmit and receive pins, with the specified baud
      *
@@ -104,6 +105,7 @@ class Serial : public SerialBase, public Stream, private NonCopyable<Serial> {
      *    Either tx or rx may be specified as NC (Not Connected) if unused
      */
     Serial(const serial_pinmap_t &explicit_pinmap, int baud);
+    Serial(const serial_pinmap_t &&, int) = delete; // prevent passing of temporary objects
 
     /* Stream gives us a FileHandle with non-functional poll()/readable()/writable. Pass through
      * the calls from the SerialBase instead for backwards compatibility. This problem is