Shifting BT power pin references to mbed style in transport ccriver and cy_bt_cordio_cfg; removing freeing of dev wake pin and changing to deasserting this during terminate

Author: keithmwheeler

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp

@@ -31,7 +31,7 @@ namespace cypress_ble {
 
 using namespace std::chrono_literals;
 
-CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name, uint8_t host_wake_irq, uint8_t dev_wake_irq) :
+CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, PinName bt_power_name, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name, uint8_t host_wake_irq, uint8_t dev_wake_irq) :
     cts(cts), rts(rts),
     tx(tx), rx(rx),
     bt_host_wake_name(bt_host_wake_name),
@@ -40,21 +40,21 @@ CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, Pi
     bt_device_wake(bt_device_wake_name, PIN_OUTPUT, PullNone, 1),
     host_wake_irq_event(host_wake_irq),
     dev_wake_irq_event(dev_wake_irq),
-    bt_power(CYBSP_BT_POWER, PIN_OUTPUT, PullNone, 0)
+    bt_power(bt_power_name, PIN_OUTPUT, PullNone, 0)
 {
     enabled_powersave = true;
     bt_host_wake_active = false;
 }
 
-CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud) :
+CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts,  PinName bt_power_name, int baud) :
     cts(cts),
     rts(rts),
     tx(tx), rx(rx),
     bt_host_wake_name(NC),
     bt_device_wake_name(NC),
     bt_host_wake(bt_host_wake_name),
     bt_device_wake(bt_device_wake_name),
-    bt_power(CYBSP_BT_POWER, PIN_OUTPUT, PullNone, 0)
+    bt_power(bt_power_name, PIN_OUTPUT, PullNone, 0)
 {
     enabled_powersave = false;
     bt_host_wake_active = false;
@@ -169,11 +169,6 @@ void CyH4TransportDriver::terminate()
                             false
                         );
 
-    // DigitalInOut does not appear to have Destructor nor does it have a
-    // free() func (though the protected gpio_t does) so must call directly
-    // into cyhal
-    if(CYBSP_BT_DEVICE_WAKE != NC) cyhal_gpio_free(CYBSP_BT_DEVICE_WAKE);
-
     if(bt_host_wake.is_connected())
     {
 #if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
@@ -182,6 +177,8 @@ void CyH4TransportDriver::terminate()
         bt_host_wake = false;
     }
 
+    deassert_bt_dev_wake();
+
     bt_power = 0; //BT_POWER is an output, should not be freed only set inactive
 
     cyhal_uart_free(&uart);
@@ -265,14 +262,14 @@ ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_default_h4_transpo
 #if (defined(CYBSP_BT_HOST_WAKE) && defined(CYBSP_BT_DEVICE_WAKE))
     static ble::vendor::cypress_ble::CyH4TransportDriver s_transport_driver(
        /* TX */ CYBSP_BT_UART_TX, /* RX */ CYBSP_BT_UART_RX,
-       /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, DEF_BT_BAUD_RATE,
+       /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, CYBSP_BT_POWER, DEF_BT_BAUD_RATE,
        CYBSP_BT_HOST_WAKE, CYBSP_BT_DEVICE_WAKE
     );
 
 #else
     static ble::vendor::cypress_ble::CyH4TransportDriver s_transport_driver(
         /* TX */ CYBSP_BT_UART_TX, /* RX */ CYBSP_BT_UART_RX,
-        /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, DEF_BT_BAUD_RATE);
+        /* cts */ CYBSP_BT_UART_CTS, /* rts */ CYBSP_BT_UART_RTS, CYBSP_BT_POWER, DEF_BT_BAUD_RATE);
 #endif
     return s_transport_driver;
 }

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h

@@ -41,9 +41,9 @@ class CyH4TransportDriver : public CordioHCITransportDriver {
      * Initialize the transport driver.
      *
      */
-	CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name,
+	CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, PinName bt_power_name, int baud, PinName bt_host_wake_name, PinName bt_device_wake_name,
                             uint8_t host_wake_irq = 0, uint8_t dev_wake_irq = 0);
-        CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud);
+        CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts,  PinName bt_power_name, int baud);
 
     /**
      * Destructor

connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/TARGET_PSOC6/cy_bt_cordio_cfg.cpp

@@ -87,7 +87,8 @@ ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_h4_transport_drive
           /* TX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_TX),
           /* RX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RX),
           /* cts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_CTS),
-          /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), DEF_BT_BAUD_RATE,
+          /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), 
+          /* power */ cyhal_gpio_to_rtos(CYBSP_BT_POWER), DEF_BT_BAUD_RATE,
           cyhal_gpio_to_rtos(CYCFG_BT_HOST_WAKE_GPIO),
           cyhal_gpio_to_rtos(CYCFG_BT_DEV_WAKE_GPIO),
           CYCFG_BT_HOST_WAKE_IRQ_EVENT,
@@ -99,15 +100,17 @@ ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_h4_transport_drive
           /* TX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_TX),
           /* RX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RX),
           /* cts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_CTS),
-          /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), DEF_BT_BAUD_RATE);
+          /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), 
+           /* power */ cyhal_gpio_to_rtos(CYBSP_BT_POWER), DEF_BT_BAUD_RATE);
        return s_transport_driver;
     }
 #else  /* (defined(CYCFG_BT_LP_ENABLED)) */
     static ble::vendor::cypress_ble::CyH4TransportDriver s_transport_driver(
        /* TX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_TX),
        /* RX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RX),
        /* cts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_CTS),
-       /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), DEF_BT_BAUD_RATE,
+       /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), 
+       /* power */ cyhal_gpio_to_rtos(CYBSP_BT_POWER), DEF_BT_BAUD_RATE,
        cyhal_gpio_to_rtos(CYBSP_BT_HOST_WAKE), cyhal_gpio_to_rtos(CYBSP_BT_DEVICE_WAKE)
     );
     return s_transport_driver;
@@ -118,7 +121,8 @@ ble::vendor::cypress_ble::CyH4TransportDriver& ble_cordio_get_h4_transport_drive
        /* TX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_TX),
        /* RX */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RX),
        /* cts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_CTS),
-       /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), DEF_BT_BAUD_RATE);
+       /* rts */ cyhal_gpio_to_rtos(CYBSP_BT_UART_RTS), 
+       /* power */ cyhal_gpio_to_rtos(CYBSP_BT_POWER), DEF_BT_BAUD_RATE);
     return s_transport_driver;
 #endif /* (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER) */
 }