From 1e56565692384c4f6f1b0dfa94c4e33d6bb8bec9 Mon Sep 17 00:00:00 2001 From: "Wheeler Keith (CY CSS ICW Integration)" Date: Thu, 3 Dec 2020 20:26:48 -0800 Subject: [PATCH] Clean up from 2 Dec review --- .../COMPONENT_CYW43XXX/CyH4TransportDriver.cpp | 11 ++++++----- .../COMPONENT_CYW43XXX/CyH4TransportDriver.h | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp index 62ff5a68e6..8b9639dac8 100644 --- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp +++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.cpp @@ -36,11 +36,12 @@ CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, Pi tx(tx), rx(rx), bt_host_wake_name(bt_host_wake_name), bt_device_wake_name(bt_device_wake_name), + bt_power(bt_power_name, PIN_OUTPUT, PullNone, 0), bt_host_wake(bt_host_wake_name, PIN_INPUT, PullNone, 0), 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(bt_power_name, PIN_OUTPUT, PullNone, 0) + dev_wake_irq_event(dev_wake_irq) + { enabled_powersave = true; bt_host_wake_active = false; @@ -52,9 +53,10 @@ CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, Pi tx(tx), rx(rx), bt_host_wake_name(NC), bt_device_wake_name(NC), + bt_power(bt_power_name, PIN_OUTPUT, PullNone, 0), bt_host_wake(bt_host_wake_name), - bt_device_wake(bt_device_wake_name), - bt_power(bt_power_name, PIN_OUTPUT, PullNone, 0) + bt_device_wake(bt_device_wake_name) + { enabled_powersave = false; bt_host_wake_active = false; @@ -174,7 +176,6 @@ void CyH4TransportDriver::terminate() #if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER) delete host_wake_pin; #endif - bt_host_wake = false; } deassert_bt_dev_wake(); diff --git a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h index 91bdb3b2d8..bac796b2ef 100644 --- a/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h +++ b/connectivity/drivers/ble/FEATURE_BLE/COMPONENT_CYW43XXX/CyH4TransportDriver.h @@ -98,12 +98,14 @@ private: PinName bt_host_wake_name; PinName bt_device_wake_name; + mbed::DigitalInOut bt_power; mbed::DigitalInOut bt_host_wake; mbed::DigitalInOut bt_device_wake; + bool bt_host_wake_active; #if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER) - mbed::InterruptIn *host_wake_pin; + mbed::InterruptIn *host_wake_pin; #endif bool enabled_powersave; @@ -111,8 +113,6 @@ private: uint8_t dev_wake_irq_event; bool holding_deep_sleep_lock; - mbed::DigitalInOut bt_power; - }; } // namespace cypress