Improve code generation.

.github/workflows/ci.yml

@@ -2,8 +2,6 @@ name: CI
 
 on:
   push:
-    branches:
-      - master
   pull_request:
   schedule:
     - cron: '50 4 * * *'

Cargo.toml

@@ -37,3 +37,6 @@ anyhow = "1"
 strum = { version = "0.23", features = ["derive"], optional = true }
 regex = "1.5"
 bindgen = "0.59"
+
+[patch.crates-io]
+ring = { git = "https://github.com/gear-tech/ring.git", branch = "v0.16.20-fix-nightly" }

build/build.rs

@@ -5,7 +5,10 @@ use std::env;
 use std::iter::once;
 use std::path::PathBuf;
 
-use ::bindgen::callbacks::{IntKind, ParseCallbacks};
+use ::bindgen::{
+    callbacks::{IntKind, ParseCallbacks},
+    EnumVariation,
+};
 use anyhow::*;
 use common::*;
 use embuild::utils::OsStrExt;
@@ -29,16 +32,24 @@ struct BindgenCallbacks;
 impl ParseCallbacks for BindgenCallbacks {
     fn int_macro(&self, name: &str, _value: i64) -> Option<IntKind> {
         // Make sure the ESP_ERR_*, ESP_OK and ESP_FAIL macros are all i32.
-        const PREFIX: &str = "ESP_";
-        const SUFFIX: &str = "ERR_";
-        const SUFFIX_SPECIAL: [&str; 2] = ["OK", "FAIL"];
+        if let Some(name) = name.strip_prefix("ESP_") {
+            if name == "OK" || name == "FAIL" || name.starts_with("ERR_") {
+                return Some(IntKind::I32);
+            }
+        }
 
-        let name = name.strip_prefix(PREFIX)?;
-        if name.starts_with(SUFFIX) || SUFFIX_SPECIAL.iter().any(|&s| name == s) {
-            Some(IntKind::I32)
-        } else {
-            None
+        None
+    }
+
+    fn add_derives(&self, name: &str) -> Vec<String> {
+        let mut derives = vec![];
+
+        // Make sure log levels can be compared.
+        if name == "esp_log_level_t" {
+            derives.push("PartialOrd".into());
         }
+
+        derives
     }
 }
 
@@ -93,8 +104,13 @@ fn main() -> anyhow::Result<()> {
             .bindgen
             .builder()?
             .parse_callbacks(Box::new(BindgenCallbacks))
-            .ctypes_prefix("c_types")
+            .ctypes_prefix("crate::c_types")
             .header(header_file.try_to_str()?)
+            .default_enum_style(EnumVariation::NewType { is_bitfield: false })
+            .constified_enum_module("flags")
+            .constified_enum_module("http_errno")
+            .bitfield_enum(r"esp_netif_flags(_t)?")
+            .no_default("wifi_init_config_t")
             .blocklist_function("strtold")
             .blocklist_function("_strtold_r")
             .blocklist_function("v.*printf")

src/defaults.rs

@@ -0,0 +1,36 @@
+use crate::bindings::*;
+
+impl Default for wifi_init_config_t {
+    fn default() -> Self {
+        Self {
+            event_handler: Some(esp_event_send_internal),
+            osi_funcs: unsafe { &mut g_wifi_osi_funcs },
+            wpa_crypto_funcs: unsafe { g_wifi_default_wpa_crypto_funcs },
+            static_rx_buf_num: CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM as _,
+            dynamic_rx_buf_num: CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM as _,
+            tx_buf_type: CONFIG_ESP32_WIFI_TX_BUFFER_TYPE as _,
+            static_tx_buf_num: WIFI_STATIC_TX_BUFFER_NUM as _,
+            dynamic_tx_buf_num: WIFI_DYNAMIC_TX_BUFFER_NUM as _,
+            cache_tx_buf_num: WIFI_CACHE_TX_BUFFER_NUM as _,
+            csi_enable: WIFI_CSI_ENABLED as _,
+            ampdu_rx_enable: WIFI_AMPDU_RX_ENABLED as _,
+            ampdu_tx_enable: WIFI_AMPDU_TX_ENABLED as _,
+            amsdu_tx_enable: WIFI_AMSDU_TX_ENABLED as _,
+            nvs_enable: WIFI_NVS_ENABLED as _,
+            nano_enable: WIFI_NANO_FORMAT_ENABLED as _,
+            rx_ba_win: WIFI_DEFAULT_RX_BA_WIN as _,
+            wifi_task_core_id: WIFI_TASK_CORE_ID as _,
+            beacon_max_len: WIFI_SOFTAP_BEACON_MAX_LEN as _,
+            mgmt_sbuf_num: WIFI_MGMT_SBUF_NUM as _,
+            feature_caps: unsafe { g_wifi_feature_caps },
+            sta_disconnected_pm: WIFI_STA_DISCONNECTED_PM_ENABLED != 0,
+            magic: WIFI_INIT_CONFIG_MAGIC as _,
+        }
+    }
+}
+
+impl Default for esp_log_level_t {
+    fn default() -> Self {
+        esp_log_level_t(CONFIG_LOG_DEFAULT_LEVEL)
+    }
+}

src/error.rs

@@ -62,21 +62,21 @@ impl fmt::Display for EspError {
 
 #[macro_export]
 macro_rules! esp {
-    ($err:expr) => {{
+    ($err:expr $(,)?) => {{
         esp_idf_sys::EspError::convert($err as esp_idf_sys::esp_err_t)
     }};
 }
 
 #[macro_export]
 macro_rules! esp_result {
-    ($err:expr, $value:expr) => {{
+    ($err:expr, $value:expr $(,)?) => {{
         esp_idf_sys::EspError::check_and_return($err as esp_idf_sys::esp_err_t, $value)
     }};
 }
 
 #[macro_export]
 macro_rules! esp_nofail {
-    ($err:expr) => {{
+    ($err:expr $(,)?) => {{
         if let Some(error) = esp_idf_sys::EspError::from($err as esp_idf_sys::esp_err_t) {
             error.panic();
         }

src/lib.rs

@@ -5,10 +5,12 @@
 )]
 
 pub use bindings::*;
+pub use defaults::*;
 pub use error::*;
 pub use patches::PatchesRef;
 
 mod alloc;
+mod defaults;
 mod error;
 mod panic;
 mod patches;
@@ -71,7 +73,5 @@ pub mod c_types {
 #[allow(non_snake_case)]
 #[allow(improper_ctypes)] // TODO: For now, as 5.0 spits out tons of these
 mod bindings {
-    use super::c_types;
-
     include!(env!("EMBUILD_GENERATED_BINDINGS_FILE"));
 }