Remove hand-defined radio symbols (#3632)

Author: bugadani

esp-metadata/devices/esp32.toml

@@ -66,8 +66,6 @@ symbols = [
     "dac",
     "pdma",
     "phy",
-    "bt",
-    "wifi",
     "psram",
     "timg_timer1",
     "touch",

esp-metadata/devices/esp32c2.toml

@@ -46,8 +46,6 @@ symbols = [
     "assist_debug_sp_monitor",
     "gdma",
     "phy",
-    "bt",
-    "wifi",
 
     # ROM capabilities
     "rom_crc_le",

esp-metadata/devices/esp32c3.toml

@@ -59,8 +59,6 @@ symbols = [
     "assist_debug_region_monitor",
     "gdma",
     "phy",
-    "bt",
-    "wifi",
     "tsens",
 
     # ROM capabilities

esp-metadata/devices/esp32c6.toml

@@ -86,10 +86,6 @@ symbols = [
     "large_intr_status",
     "plic",
     "phy",
-    "bt",
-    "wifi",
-    "wifi6",
-    "ieee802154",
     "lp_core",
     "tsens",
 
@@ -141,6 +137,10 @@ status = "supported"
 [device.ds]
 status = "not_supported"
 
+[device.wifi]
+status = "partial"
+has_wifi6 = true
+
 # Other drivers which are partially supported but have no other configuration:
 
 ## Crypto
@@ -176,6 +176,5 @@ status = "not_supported"
 [device.ulp_riscv]
 
 ## Radio
-[device.wifi]
 [device.bt]
 [device.ieee802154]

esp-metadata/devices/esp32h2.toml

@@ -77,7 +77,6 @@ symbols = [
     "gdma",
     "plic",
     "phy",
-    "bt",
     "ieee802154",
 
     # ROM capabilities

esp-metadata/devices/esp32s2.toml

@@ -62,7 +62,6 @@ symbols = [
     "dac",
     "pdma",
     "phy",
-    "wifi",
     "psram",
     "psram_dma",
     "ulp_riscv_core",

esp-metadata/devices/esp32s3.toml

@@ -75,8 +75,6 @@ symbols = [
     "assist_debug_region_monitor",
     "gdma",
     "phy",
-    "bt",
-    "wifi",
     "psram",
     "psram_dma",
     "octal_psram",

esp-metadata/src/generate_cfg.rs

@@ -668,7 +668,10 @@ driver_configs![
         driver: wifi,
         name: "WIFI",
         peripherals: &["wifi"],
-        properties: {}
+        properties: {
+            #[serde(default)]
+            has_wifi6: bool,
+        }
     },
     BluetoothProperties {
         driver: bt,

esp-wifi/build.rs

@@ -27,16 +27,6 @@ fn main() -> Result<(), Box<dyn Error>> {
 
         "#
     );
-    assert!(
-        !cfg!(feature = "coex") || (config.contains("wifi") && config.contains("bt")),
-        r#"
-
-        COEX is not supported on this target.
-
-        See https://github.com/esp-rs/esp-wifi/issues/92.
-
-        "#
-    );
 
     if let Ok(level) = std::env::var("OPT_LEVEL") {
         if level != "2" && level != "3" && level != "s" {
@@ -51,6 +41,15 @@ fn main() -> Result<(), Box<dyn Error>> {
     println!("cargo:rustc-check-cfg=cfg(coex)");
     #[cfg(feature = "coex")]
     {
+        assert!(
+            config.contains("wifi") && config.contains("bt"),
+            r#"
+
+            WiFi/Bluetooth coexistence is not supported on this target.
+
+            "#
+        );
+
         #[cfg(all(feature = "wifi", feature = "ble"))]
         println!("cargo:rustc-cfg=coex");
 

esp-wifi/src/wifi/event.rs

@@ -132,7 +132,7 @@ impl_wifi_event!(ApWpsRgTimeout);
 impl_wifi_event!(ApWpsRgPin, wifi_event_ap_wps_rg_pin_t);
 impl_wifi_event!(ApWpsRgPbcOverlap);
 cfg_if::cfg_if! {
-    if #[cfg(wifi6)] {
+    if #[cfg(wifi_has_wifi6)] {
         impl_wifi_event!(ItwtSetup, wifi_event_sta_itwt_setup_t);
         impl_wifi_event!(ItwtTeardown, wifi_event_sta_itwt_teardown_t);
         impl_wifi_event!(ItwtProbe, wifi_event_sta_itwt_probe_t);