Skip to content

Cypress Cordio BT Driver setting Host MCU active during Host Wake assert #11644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 17, 2019
Merged

Cypress Cordio BT Driver setting Host MCU active during Host Wake assert #11644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f50417a
Update Target Cypress Specific Cordio BT Driver to keep Host MCU acti…
MukundGitHub Oct 7, 2019
352ac5e
Address ARM Code review feedback.
MukundGitHub Oct 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 35 additions & 22 deletions features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CYW43XXX/CyH4TransportDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, Pi
dev_wake_irq_event(dev_wake_irq)
{
enabled_powersave = true;
bt_host_wake_active = false;
}

CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, PinName rts, int baud) :
Expand All @@ -46,6 +47,7 @@ CyH4TransportDriver::CyH4TransportDriver(PinName tx, PinName rx, PinName cts, Pi
bt_device_wake(bt_device_wake_name)
{
enabled_powersave = false;
bt_host_wake_active = false;
sleep_manager_lock_deep_sleep();
holding_deep_sleep_lock = true;
}
Expand All @@ -59,12 +61,36 @@ CyH4TransportDriver::~CyH4TransportDriver()
}
}

void CyH4TransportDriver::bt_host_wake_irq_handler(void)
void CyH4TransportDriver::bt_host_wake_rise_irq_handler(void)
{
uart.attach(
callback(this, &CyH4TransportDriver::on_controller_irq),
SerialBase::RxIrq
);
if (host_wake_irq_event == WAKE_EVENT_ACTIVE_LOW) {
if(bt_host_wake_active == true)
{
/* lock PSoC 6 DeepSleep entry as long as host_wake is asserted */
sleep_manager_unlock_deep_sleep();
bt_host_wake_active = false;
}
} else {
/* lock PSoC 6 DeepSleep entry as long as host_wake is asserted */
sleep_manager_lock_deep_sleep();
bt_host_wake_active = true;
}
}

void CyH4TransportDriver::bt_host_wake_fall_irq_handler(void)
{
if (host_wake_irq_event == WAKE_EVENT_ACTIVE_LOW) {
/* lock PSoC 6 DeepSleep entry as long as host_wake is asserted */
sleep_manager_lock_deep_sleep();
bt_host_wake_active = true;
} else {
if(bt_host_wake_active == true)
{
/* lock PSoC 6 DeepSleep entry as long as host_wake is asserted */
sleep_manager_unlock_deep_sleep();
bt_host_wake_active = false;
}
}
}

void CyH4TransportDriver::initialize()
Expand Down Expand Up @@ -92,17 +118,15 @@ void CyH4TransportDriver::initialize()
SerialBase::RxIrq
);

sleep_manager_unlock_deep_sleep();

#if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
if (bt_host_wake_name != NC) {
//Register IRQ for Host WAKE
host_wake_pin = new InterruptIn(bt_host_wake_name);
if (host_wake_irq_event == WAKE_EVENT_ACTIVE_LOW) {
host_wake_pin->fall(callback(this, &CyH4TransportDriver::bt_host_wake_irq_handler));
} else {
host_wake_pin->rise(callback(this, &CyH4TransportDriver::bt_host_wake_irq_handler));
}
host_wake_pin->fall(callback(this, &CyH4TransportDriver::bt_host_wake_fall_irq_handler));
host_wake_pin->rise(callback(this, &CyH4TransportDriver::bt_host_wake_rise_irq_handler));
}

#endif
if (dev_wake_irq_event == WAKE_EVENT_ACTIVE_LOW) {
if (bt_device_wake_name != NC)
Expand Down Expand Up @@ -136,26 +160,15 @@ uint16_t CyH4TransportDriver::write(uint8_t type, uint16_t len, uint8_t *pData)
return len;
}

#if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
void CyH4TransportDriver::on_host_stack_inactivity()
{
if (enabled_powersave) {
uart.attach(NULL, SerialBase::RxIrq);
}
}
#endif

void CyH4TransportDriver::on_controller_irq()
{
sleep_manager_lock_deep_sleep();
assert_bt_dev_wake();

while (uart.readable()) {
uint8_t char_received = uart.getc();
on_data_received(&char_received, 1);
}

deassert_bt_dev_wake();
sleep_manager_unlock_deep_sleep();
}

Expand Down
4 changes: 3 additions & 1 deletion features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CYW43XXX/CyH4TransportDriver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ class CyH4TransportDriver : public cordio::CordioHCITransportDriver {
*/
virtual uint16_t write(uint8_t type, uint16_t len, uint8_t *pData);

void bt_host_wake_irq_handler();
void bt_host_wake_rise_irq_handler();
void bt_host_wake_fall_irq_handler();

#if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
void on_host_stack_inactivity();
Expand Down Expand Up @@ -93,6 +94,7 @@ class CyH4TransportDriver : public cordio::CordioHCITransportDriver {

DigitalInOut bt_host_wake;
DigitalInOut bt_device_wake;
bool bt_host_wake_active;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This value should be initialised in the constructor.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for review feedback. Addressed the feedback with new commit. Please review the changes and approve the PR Merge request.


bool enabled_powersave;
uint8_t host_wake_irq_event;
Expand Down
11 changes: 2 additions & 9 deletions features/FEATURE_BLE/targets/TARGET_Cypress/TARGET_CYW43XXX/HCIDriver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ class HCIDriver : public cordio::CordioHCIDriver {
// Note: Reset is handled by ack_service_pack.
case HCI_VS_CMD_SET_SLEEP_MODE:
HciWriteLeHostSupport();
sleep_manager_unlock_deep_sleep();
break;

case HCI_OPCODE_WRITE_LE_HOST_SUPPORT:
Expand Down Expand Up @@ -318,13 +319,6 @@ class HCIDriver : public cordio::CordioHCIDriver {
}
}

#if (defined(MBED_TICKLESS) && DEVICE_SLEEP && DEVICE_LPTICKER)
virtual void on_host_stack_inactivity(void)
{
cy_transport_driver.on_host_stack_inactivity();
}
#endif

private:

// send pre_brcm_patchram_buf issue hci reset and update baud rate on 43012
Expand Down Expand Up @@ -390,7 +384,6 @@ class HCIDriver : public cordio::CordioHCIDriver {
#else /* BT_UART_NO_3M_SUPPORT */
set_sleep_mode();
#endif /* BT_UART_NO_3M_SUPPORT */
sleep_manager_unlock_deep_sleep();
}

void send_service_pack_command(void)
Expand Down Expand Up @@ -463,7 +456,7 @@ class HCIDriver : public cordio::CordioHCIDriver {
}
}

// 0x18, 0xFC, 0x06, 0x00, 0x00, 0xC0, 0xC6, 0x2D, 0x00, //update uart baudrate 3 mbp
// 0x18, 0xFC, 0x06, 0x00, 0x00, 0xC0, 0xC6, 0x2D, 0x00, //update uart baudrate 3 mbp
void HciUpdateUartBaudRate()
{
uint8_t *pBuf;
Expand Down