esp-rs · burrbull · Jan 2, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/common_patches/adc.yaml b/common_patches/adc.yaml
@@ -16,7 +16,7 @@ ARB_CTRL:
     - TSENS_
 "?~CALI":
   _modify:
-    CALI_CFG:
+    "CFG,CALI_CFG":
       name: CFG
 "INT_*":
   _modify:

diff --git a/esp32/src/wifi.rs b/esp32/src/wifi.rs
@@ -42,8 +42,6 @@ pub struct RegisterBlock {
     hw_stat_panic: HW_STAT_PANIC,
     _reserved30: [u8; 0x03f4],
     tx_slot_parameters: [TX_SLOT_PARAMETERS; 5],
-    _reserved31: [u8; 0x016c],
-    crypto_key_entry: [CRYPTO_KEY_ENTRY; 16],
 }
 impl RegisterBlock {
     #[doc = "0x00..0x80 - Filter banks for frame reception. Bank zero is for the BSSID and bank one for the RA. Each filter bank has registers for two interfaces."]
@@ -225,17 +223,6 @@ impl RegisterBlock {
     pub fn tx_slot_parameters_iter(&self) -> impl Iterator<Item = &TX_SLOT_PARAMETERS> {
         self.tx_slot_parameters.iter()
     }
-    #[doc = "0x1400..0x1680 - The cryptographic keys, to be used by the MAC"]
-    #[inline(always)]
-    pub const fn crypto_key_entry(&self, n: usize) -> &CRYPTO_KEY_ENTRY {
-        &self.crypto_key_entry[n]
-    }
-    #[doc = "Iterator for array of:"]
-    #[doc = "0x1400..0x1680 - The cryptographic keys, to be used by the MAC"]
-    #[inline(always)]
-    pub fn crypto_key_entry_iter(&self) -> impl Iterator<Item = &CRYPTO_KEY_ENTRY> {
-        self.crypto_key_entry.iter()
-    }
 }
 #[doc = "RX_CTRL (rw) register accessor: Controls the reception of frames\n\nYou can [`read`](crate::Reg::read) this register and get [`rx_ctrl::R`]. You can [`reset`](crate::Reg::reset), [`write`](crate::Reg::write), [`write_with_zero`](crate::Reg::write_with_zero) this register using [`rx_ctrl::W`]. You can also [`modify`](crate::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@rx_ctrl`] module"]
 pub type RX_CTRL = crate::Reg<rx_ctrl::RX_CTRL_SPEC>;
@@ -364,8 +351,3 @@ pub use self::tx_slot_parameters::TX_SLOT_PARAMETERS;
 #[doc = r"Cluster"]
 #[doc = "Used to set transmission parameters for the slot"]
 pub mod tx_slot_parameters;
-#[doc = "The cryptographic keys, to be used by the MAC"]
-pub use self::crypto_key_entry::CRYPTO_KEY_ENTRY;
-#[doc = r"Cluster"]
-#[doc = "The cryptographic keys, to be used by the MAC"]
-pub mod crypto_key_entry;
diff --git a/esp32/src/wifi/crypto_key_entry.rs b/esp32/src/wifi/crypto_key_entry.rs
diff --git a/esp32/src/wifi/crypto_key_entry/addr_high.rs b/esp32/src/wifi/crypto_key_entry/addr_high.rs
diff --git a/esp32/src/wifi/crypto_key_entry/addr_low.rs b/esp32/src/wifi/crypto_key_entry/addr_low.rs
diff --git a/esp32h2/svd/patches/esp32h2.yaml b/esp32h2/svd/patches/esp32h2.yaml
@@ -570,31 +570,31 @@ TWAI0:
 
   DATA*:
     _modify:
-      DATA_0:
+      "?~DATA_0":
         name: TX_BYTE_0
-      DATA_1:
+      "?~DATA_1":
         name: TX_BYTE_1
-      DATA_2:
+      "?~DATA_2":
         name: TX_BYTE_2
-      DATA_3:
+      "?~DATA_3":
         name: TX_BYTE_3
-      DATA_4:
+      "?~DATA_4":
         name: TX_BYTE_4
-      DATA_5:
+      "?~DATA_5":
         name: TX_BYTE_5
-      DATA_6:
+      "?~DATA_6":
         name: TX_BYTE_6
-      DATA_7:
+      "?~DATA_7":
         name: TX_BYTE_7
-      DATA_8:
+      "?~DATA_8":
         name: TX_BYTE_8
-      DATA_9:
+      "?~DATA_9":
         name: TX_BYTE_9
-      DATA_10:
+      "?~DATA_10":
         name: TX_BYTE_10
-      DATA_11:
+      "?~DATA_11":
         name: TX_BYTE_11
-      DATA_12:
+      "?~DATA_12":
         name: TX_BYTE_12
 
 ASSIST_DEBUG:

diff --git a/esp32p4/src/clic/int_config.rs b/esp32p4/src/clic/int_config.rs
@@ -44,19 +44,16 @@ impl core::fmt::Debug for R {
 impl W {
     #[doc = "Bit 0 - Number of vector bits for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_config_nvbits(&mut self) -> INT_CONFIG_NVBITS_W<INT_CONFIG_SPEC> {
         INT_CONFIG_NVBITS_W::new(self, 0)
     }
     #[doc = "Bits 1:4 - Number of level bits for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_config_nlbits(&mut self) -> INT_CONFIG_NLBITS_W<INT_CONFIG_SPEC> {
         INT_CONFIG_NLBITS_W::new(self, 1)
     }
     #[doc = "Bits 5:6 - Number of mode bits for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_config_nmbits(&mut self) -> INT_CONFIG_NMBITS_W<INT_CONFIG_SPEC> {
         INT_CONFIG_NMBITS_W::new(self, 5)
     }

diff --git a/esp32p4/src/clic/int_ctrl.rs b/esp32p4/src/clic/int_ctrl.rs
@@ -74,37 +74,31 @@ impl core::fmt::Debug for R {
 impl W {
     #[doc = "Bit 0 - Pending interrupt bit"]
     #[inline(always)]
-    #[must_use]
     pub fn int_ip(&mut self) -> INT_IP_W<INT_CTRL_SPEC> {
         INT_IP_W::new(self, 0)
     }
     #[doc = "Bit 8 - Interrupt enable bit"]
     #[inline(always)]
-    #[must_use]
     pub fn int_ie(&mut self) -> INT_IE_W<INT_CTRL_SPEC> {
         INT_IE_W::new(self, 8)
     }
     #[doc = "Bit 16 - Shadow vector attribute"]
     #[inline(always)]
-    #[must_use]
     pub fn int_attr_shv(&mut self) -> INT_ATTR_SHV_W<INT_CTRL_SPEC> {
         INT_ATTR_SHV_W::new(self, 16)
     }
     #[doc = "Bits 17:18 - Trigger attribute for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_attr_trig(&mut self) -> INT_ATTR_TRIG_W<INT_CTRL_SPEC> {
         INT_ATTR_TRIG_W::new(self, 17)
     }
     #[doc = "Bits 22:23 - Interrupt mode attribute"]
     #[inline(always)]
-    #[must_use]
     pub fn int_attr_mode(&mut self) -> INT_ATTR_MODE_W<INT_CTRL_SPEC> {
         INT_ATTR_MODE_W::new(self, 22)
     }
     #[doc = "Bits 24:31 - Control bits for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_ctl(&mut self) -> INT_CTL_W<INT_CTRL_SPEC> {
         INT_CTL_W::new(self, 24)
     }

diff --git a/esp32p4/src/clic/int_info.rs b/esp32p4/src/clic/int_info.rs
@@ -44,19 +44,16 @@ impl core::fmt::Debug for R {
 impl W {
     #[doc = "Bits 0:12 - Number of interrupts"]
     #[inline(always)]
-    #[must_use]
     pub fn int_info_num_int(&mut self) -> INT_INFO_NUM_INT_W<INT_INFO_SPEC> {
         INT_INFO_NUM_INT_W::new(self, 0)
     }
     #[doc = "Bits 13:20 - Version of interrupt module"]
     #[inline(always)]
-    #[must_use]
     pub fn int_info_version(&mut self) -> INT_INFO_VERSION_W<INT_INFO_SPEC> {
         INT_INFO_VERSION_W::new(self, 13)
     }
     #[doc = "Bits 21:24 - Control bits for interrupt"]
     #[inline(always)]
-    #[must_use]
     pub fn int_info_ctlbits(&mut self) -> INT_INFO_CTLBITS_W<INT_INFO_SPEC> {
         INT_INFO_CTLBITS_W::new(self, 21)
     }

diff --git a/esp32p4/src/clic/int_thresh.rs b/esp32p4/src/clic/int_thresh.rs
@@ -24,7 +24,6 @@ impl core::fmt::Debug for R {
 impl W {
     #[doc = "Bits 24:31 - CPU interrupt threshold level"]
     #[inline(always)]
-    #[must_use]
     pub fn cpu_int_thresh(&mut self) -> CPU_INT_THRESH_W<INT_THRESH_SPEC> {
         CPU_INT_THRESH_W::new(self, 24)
     }

diff --git a/esp32p4/svd/patches/esp32p4.yaml b/esp32p4/svd/patches/esp32p4.yaml
@@ -667,25 +667,7 @@ AHB_DMA:
 
 AXI_DMA:
   OUT_CONF0_CH?:
-    _modify:
-      OUT_RST_CH?:
-        name: OUT_RST_CH
-      OUT_RST_CHOUT_LOOP_TEST_CH?:
-        name: OUT_RST_CHOUT_LOOP_TEST_CH
-      OUT_LOOP_TEST_CHOUT_AUTO_WRBACK_CH?:
-        name: OUT_LOOP_TEST_CHOUT_AUTO_WRBACK_CH
-      OUT_AUTO_WRBACK_CHOUT_EOF_MODE_CH?:
-        name: OUT_AUTO_WRBACK_CHOUT_EOF_MODE_CH
-      OUT_EOF_MODE_CHOUT_ETM_EN_CH?:
-        name: OUT_EOF_MODE_CHOUT_ETM_EN_CH
-      OUT_ETM_EN_CHOUT_BURST_SIZE_SEL_CH?:
-        name: OUT_ETM_EN_CHOUT_BURST_SIZE_SEL_CH
-      OUT_BURST_SIZE_SEL_CHOUT_CMD_DISABLE_CH?:
-        name: OUT_BURST_SIZE_SEL_CHOUT_CMD_DISABLE_CH
-      OUT_CMD_DISABLE_CHOUT_ECC_AEC_EN_CH?:
-        name: OUT_CMD_DISABLE_CHOUT_ECC_AEC_EN_CH
-      OUT_ECC_AEC_EN_CHOUTDSCR_BURST_EN_CH?:
-        name: OUT_ECC_AEC_EN_CHOUTDSCR_BURST_EN_CH
+    _strip_end: "0"
 
   _expand_array:
     IN_INT_RAW_CH%s: {}

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -1,17 +1,20 @@
 [package]
-name    = "xtask"
+name = "xtask"
 version = "0.0.0"
 edition = "2021"
 publish = false
 
 [dependencies]
-anyhow     = "1.0.93"
-clap       = { version = "4.5.20", features = ["derive"] }
+anyhow = "1.0.93"
+clap = { version = "4.5.20", features = ["derive"] }
 env_logger = "0.11.5"
-form       = "0.12.1"
-log        = "0.4.22"
-semver     = "1.0.23"
-strum      = { version = "0.26.3", features = ["derive"] }
-svd2rust   = { version = "0.34.0", features = ["serde", "yaml"], default-features = false }
-svdtools   = "0.3.19"
-toml_edit  = "0.22.22"
+form = "0.12.1"
+log = "0.4.22"
+semver = "1.0.23"
+strum = { version = "0.26.3", features = ["derive"] }
+svd2rust = { version = "0.34.0", features = [
+    "serde",
+    "yaml",
+], default-features = false }
+svdtools = { git = "https://github.com/rust-embedded/svdtools", branch = "ignore-fields" }
+toml_edit = "0.22.22"