Change explicit pinmap to static pinmap

Author: mprse

TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp

@@ -28,7 +28,7 @@
 #include "greentea-client/test_env.h"
 #include "mbed.h"
 #include "pinmap.h"
-#include "hal/explicit_pinmap.h"
+#include "hal/static_pinmap.h"
 #include "test_utils.h"
 #include "MbedTester.h"
 #include "analogin_fpga_test.h"

TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp

@@ -29,7 +29,7 @@
 #include "mbed.h"
 #include "i2c_api.h"
 #include "pinmap.h"
-#include "hal/explicit_pinmap.h"
+#include "hal/static_pinmap.h"
 #include "test_utils.h"
 #include "I2CTester.h"
 #include "i2c_fpga_test.h"
@@ -69,11 +69,11 @@ void fpga_i2c_test_write(PinName sda, PinName scl)
     i2c_t i2c;
     memset(&i2c, 0, sizeof(i2c));
     if (init_direct) {
-#if EXPLICIT_PINMAP_READY
+#if STATIC_PINMAP_READY
         const i2c_pinmap_t pinmap = get_i2c_pinmap(sda, scl);
         i2c_init_direct(&i2c, &pinmap);
 #else
-        //skip this test case if explicit pinmap is not supported
+        //skip this test case if static pinmap is not supported
         return;
 #endif
     } else {

TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp

@@ -29,7 +29,7 @@
 #include "mbed.h"
 #include "MbedTester.h"
 #include "pinmap.h"
-#include "hal/explicit_pinmap.h"
+#include "hal/static_pinmap.h"
 #include "test_utils.h"
 #include "pwm_fpga_test.h"
 

TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp

@@ -29,7 +29,7 @@
 #include "mbed.h"
 #include "SPIMasterTester.h"
 #include "pinmap.h"
-#include "hal/explicit_pinmap.h"
+#include "hal/static_pinmap.h"
 #include "test_utils.h"
 #include "spi_fpga_test.h"
 

TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp

@@ -34,7 +34,7 @@
 #include "serial_api.h"
 #include "us_ticker_api.h"
 #include "uart_fpga_test.h"
-#include "hal/explicit_pinmap.h"
+#include "hal/static_pinmap.h"
 
 using namespace utest::v1;
 
@@ -128,11 +128,11 @@ static void uart_test_common(int baudrate, int data_bits, SerialParity parity, i
 #if DEVICE_SERIAL_FC
     if (use_flow_control) {
         if (init_direct) {
-#if EXPLICIT_PINMAP_READY
+#if STATIC_PINMAP_READY
             const serial_fc_pinmap_t pinmap = get_uart_fc_pinmap(rts, cts);
             serial_set_flow_control_direct(&serial, FlowControlRTSCTS, &pinmap);
 #else
-            //skip this test case if explicit pinmap is not supported
+            //skip this test case if static pinmap is not supported
             return;
 #endif
         } else {

drivers/I2C.h

@@ -103,9 +103,9 @@ class I2C : private NonCopyable<I2C> {
 
     /** Create an I2C Master interface, connected to the specified pins
      *
-     *  @param explicit_pinmap reference to structure which holds static pinmap.
+     *  @param static_pinmap reference to structure which holds static pinmap.
      */
-    I2C(const i2c_pinmap_t &explicit_pinmap);
+    I2C(const i2c_pinmap_t &static_pinmap);
     I2C(const i2c_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Set the frequency of the I2C interface

drivers/I2CSlave.h

@@ -88,9 +88,9 @@ class I2CSlave {
 
     /** Create an I2C Slave interface, connected to the specified pins.
      *
-     *  @param explicit_pinmap reference to structure which holds static pinmap.
+     *  @param static_pinmap reference to structure which holds static pinmap.
      */
-    I2CSlave(const i2c_pinmap_t &explicit_pinmap);
+    I2CSlave(const i2c_pinmap_t &static_pinmap);
     I2CSlave(const i2c_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Set the frequency of the I2C interface.

drivers/QSPI.h

@@ -235,7 +235,7 @@ 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;
+    const qspi_pinmap_t *_static_pinmap;
     bool (QSPI::* _init_func)(void);
 
 private:

drivers/SPI.h

@@ -140,9 +140,9 @@ class SPI : private NonCopyable<SPI> {
      *
      *  @note You can specify mosi or miso as NC if not used.
      *
-     *  @param explicit_pinmap reference to structure which holds static pinmap.
+     *  @param static_pinmap reference to structure which holds static pinmap.
      */
-    SPI(const spi_pinmap_t &explicit_pinmap);
+    SPI(const spi_pinmap_t &static_pinmap);
     SPI(const spi_pinmap_t &&) = delete; // prevent passing of temporary objects
 
     /** Create a SPI master connected to the specified pins.
@@ -154,10 +154,10 @@ class SPI : private NonCopyable<SPI> {
      *
      *  @note You can specify mosi or miso as NC if not used.
      *
-     *  @param explicit_pinmap reference to structure which holds static pinmap.
+     *  @param static_pinmap reference to structure which holds static pinmap.
      *  @param ssel SPI Chip Select pin.
      */
-    SPI(const spi_pinmap_t &explicit_pinmap, PinName ssel);
+    SPI(const spi_pinmap_t &static_pinmap, PinName ssel);
     SPI(const spi_pinmap_t &&, PinName) = delete; // prevent passing of temporary objects
 
     virtual ~SPI();
@@ -438,7 +438,7 @@ class SPI : private NonCopyable<SPI> {
     /* Select count to handle re-entrant selection */
     int8_t _select_count;
     /* Static pinmap data */
-    const spi_pinmap_t *_explicit_pinmap;
+    const spi_pinmap_t *_static_pinmap;
     /* SPI peripheral name */
     SPIName _peripheral_name;
     /* Pointer to spi init function */

drivers/SPISlave.h

@@ -75,7 +75,7 @@ class SPISlave : private NonCopyable<SPISlave> {
      *
      *  @note Either mosi or miso can be specified as NC if not used.
      *
-     *  @param explicit_pinmap reference to structure which holds static pinmap.
+     *  @param static_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