From 0928cd10ca3d4bd924f7a6e4f68a967202a58aa6 Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Sun, 10 Mar 2024 21:49:12 +0100
Subject: [PATCH] riot-rs-embassy: introduce & use `wifi` feature

---
 src/riot-rs-embassy/Cargo.toml      | 5 +++--
 src/riot-rs-embassy/src/lib.rs      | 9 +++------
 src/riot-rs-embassy/src/wifi/mod.rs | 6 ++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/riot-rs-embassy/Cargo.toml b/src/riot-rs-embassy/Cargo.toml
index 4179a8752..607febce6 100644
--- a/src/riot-rs-embassy/Cargo.toml
+++ b/src/riot-rs-embassy/Cargo.toml
@@ -64,8 +64,9 @@ usb = ["dep:embassy-usb"]
 net = ["dep:embassy-net"]
 usb-ethernet = ["usb", "net"]
 
-wifi-esp = ["dep:esp-wifi", "dep:embassy-net-driver-channel", "net"]
-wifi-cyw43 = ["dep:cyw43", "dep:cyw43-pio", "dep:embassy-net-driver-channel", "net"]
+wifi = []
+wifi-esp = ["dep:esp-wifi", "dep:embassy-net-driver-channel", "net", "wifi"]
+wifi-cyw43 = ["dep:cyw43", "dep:cyw43-pio", "dep:embassy-net-driver-channel", "net", "wifi"]
 
 threading = ["dep:riot-rs-core"]
 override-network-config = []
diff --git a/src/riot-rs-embassy/src/lib.rs b/src/riot-rs-embassy/src/lib.rs
index e0dbfe9d5..f62fd0966 100644
--- a/src/riot-rs-embassy/src/lib.rs
+++ b/src/riot-rs-embassy/src/lib.rs
@@ -21,7 +21,7 @@ pub mod usb;
 #[cfg(feature = "net")]
 pub mod network;
 
-#[cfg(any(feature = "wifi-cyw43", feature = "wifi-esp"))]
+#[cfg(feature = "wifi")]
 mod wifi;
 
 // re-exports
@@ -33,11 +33,8 @@ pub use embassy_executor::Spawner;
 #[cfg(feature = "usb-ethernet")]
 use usb::ethernet::NetworkDevice;
 
-#[cfg(feature = "wifi-cyw43")]
-use wifi::cyw43::NetworkDevice;
-
-#[cfg(feature = "wifi-esp")]
-use wifi::esp_wifi::NetworkDevice;
+#[cfg(feature = "wifi")]
+use wifi::NetworkDevice;
 
 #[cfg(feature = "net")]
 pub use network::NetworkStack;
diff --git a/src/riot-rs-embassy/src/wifi/mod.rs b/src/riot-rs-embassy/src/wifi/mod.rs
index faf11f099..ba31f5b87 100644
--- a/src/riot-rs-embassy/src/wifi/mod.rs
+++ b/src/riot-rs-embassy/src/wifi/mod.rs
@@ -3,6 +3,12 @@ pub mod cyw43;
 #[cfg(feature = "wifi-esp")]
 pub mod esp_wifi;
 
+#[cfg(feature = "wifi-cyw43")]
+pub(crate) use cyw43::NetworkDevice;
+
+#[cfg(feature = "wifi-esp")]
+pub(crate) use esp_wifi::NetworkDevice;
+
 use riot_rs_utils::str_from_env_or;
 
 pub(crate) const WIFI_NETWORK: &str = str_from_env_or!(