itsscb/esp-hal
1
0
Fork 0
mirror of https://github.com/esp-rs/esp-hal.git synced 2025-09-27 12:20:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

esp-wifi: Fix ble + coex + defmt for ESP32 (#3596)

Browse Source 
* Make CI fail as it should

* Fix ESP32 + defmt + ble + coex

* CHANGELOG
This commit is contained in:
Björn Quentin 2025-06-04 16:26:59 +02:00 committed by GitHub
parent b6ba222dec
commit 75f728aec9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
esp-wifi/CHANGELOG.md
View File

@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fix a compilation error for ESP32 + coex + ble + defmt (#3596)
### Removed

11
esp-wifi/src/ble/os_adapter_esp32.rs
View File

@ -633,7 +633,7 @@ pub(crate) const BTDM_ASYNC_WAKEUP_REQ_COEX: i32 = 1;
/// *************************************************************************
#[cfg(coex)]
pub(crate) fn async_wakeup_request(event: i32) -> bool {
trace!("async_wakeup_request {event}");
trace!("async_wakeup_request {}", event);
unsafe extern "C" {
fn btdm_in_wakeup_requesting_set(set: bool);
@ -643,7 +643,7 @@ pub(crate) fn async_wakeup_request(event: i32) -> bool {
fn btdm_wakeup_request();
}
let request_lock = match event {
match event {
e if e == BTDM_ASYNC_WAKEUP_REQ_HCI => {
unsafe {
btdm_in_wakeup_requesting_set(true);
@ -664,9 +664,8 @@ pub(crate) fn async_wakeup_request(event: i32) -> bool {
false
}
}
_ => return false,
};
request_lock
_ => false,
}
}
/// **************************************************************************
@ -684,7 +683,7 @@ pub(crate) fn async_wakeup_request(event: i32) -> bool {
/// *************************************************************************
#[cfg(coex)]
pub(crate) fn async_wakeup_request_end(event: i32) {
trace!("async_wakeup_request_end {event}");
trace!("async_wakeup_request_end {}", event);
let request_lock = match event {
e if e == BTDM_ASYNC_WAKEUP_REQ_HCI => true,

4
xtask/src/lib.rs
View File

@ -146,10 +146,10 @@ impl Package {
features.push("smoltcp/proto-ipv4".to_owned());
features.push("smoltcp/proto-ipv6".to_owned());
}
if config.contains("ble") {
if config.contains("bt") {
features.push("ble".to_owned());
}
if config.contains("coex") {
if config.contains("wifi") && config.contains("bt") {
features.push("coex".to_owned());
}
}