Skip to content

Commit

Permalink
remove unneded _int suffixes (#214)
Browse files Browse the repository at this point in the history
* patch: remove unneded int suffixes

* generate: remove unneded int suffixes
  • Loading branch information
burrbull authored Mar 29, 2024
1 parent 6256183 commit d8ed140
Show file tree
Hide file tree
Showing 1,591 changed files with 89,022 additions and 100,216 deletions.
11 changes: 11 additions & 0 deletions common_patches/ecc_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
MULT_INT_RAW:
_strip_end: _INT_RAW
MULT_INT_ST:
_strip_end: _INT_ST
MULT_INT_ENA:
_strip_end: _INT_ENA
MULT_INT_CLR:
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
19 changes: 19 additions & 0 deletions common_patches/extmem_cache_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
"CACHE_ILG_INT_ST,CORE0_ACS_CACHE_INT_ST":
_strip_end: _ST
"CACHE_ILG_INT_ENA,CORE0_ACS_CACHE_INT_ENA":
_strip_end: _INT_ENA
"CACHE_ILG_INT_CLR,CORE0_ACS_CACHE_INT_CLR":
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
CACHE_PRELOAD_INT_CTRL:
_strip: ICACHE_PRELOAD_INT_
_modify:
CLR:
modifiedWriteValues: oneToClear
CACHE_SYNC_INT_CTRL:
_strip: ICACHE_SYNC_INT_
_modify:
CLR:
modifiedWriteValues: oneToClear
11 changes: 11 additions & 0 deletions common_patches/int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
INT_RAW:
_strip_end: _INT_RAW
INT_ST:
_strip_end: _INT_ST
INT_ENA:
_strip_end: _INT_ENA
INT_CLR:
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
12 changes: 12 additions & 0 deletions common_patches/lpana_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
LP_INT_RAW:
_strip_end: _LP_INT_RAW
LP_INT_ST:
_strip_end: _LP_INT_ST
LP_INT_ENA:
_strip_end: _LP_INT_ENA
LP_INT_CLR:
_strip_end: _LP_INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
_include: int_strip.yaml
30 changes: 30 additions & 0 deletions common_patches/lptim_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
INT_RAW:
_strip_end:
- _INT_RAW
- _RAW
INT_ST:
_strip_end:
- _INT_ST
- _ST
INT_ENA:
_strip_end:
- _INT_ENA
- _ENA
INT_CLR:
_strip_end:
- _INT_CLR
- _CLR
_modify:
"*":
modifiedWriteValues: oneToClear
LP_INT_RAW:
_strip_end: _LP_INT_RAW
LP_INT_ST:
_strip_end: _LP_INT_ST
LP_INT_ENA:
_strip_end: _LP_INT_ENA
LP_INT_CLR:
_strip_end: _LP_INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
18 changes: 18 additions & 0 deletions common_patches/pmu_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
_modify:
HP_INT_ST:
name: INT_ST
HP_INT_ENA:
name: INT_ENA
HP_INT_CLR:
name: INT_CLR
"INT_RAW,LP_INT_RAW":
_strip_end: _INT_RAW
"INT_ST,LP_INT_ST":
_strip_end: _INT_ST
"INT_ENA,LP_INT_ENA":
_strip_end: _INT_ENA
"INT_CLR,LP_INT_CLR":
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
20 changes: 20 additions & 0 deletions common_patches/rtc_cntl_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
_modify:
INT_RAW_RTC:
name: INT_RAW
INT_ST_RTC:
name: INT_ST
INT_ENA_RTC:
name: INT_ENA
INT_CLR_RTC:
name: INT_CLR
INT_ENA_RTC_W1TS:
_strip_end: _INT_ENA_W1TS
_modify:
"*":
modifiedWriteValues: oneToSet
INT_ENA_RTC_W1TC:
_strip_end: _INT_ENA_W1TC
_modify:
"*":
modifiedWriteValues: oneToClear
_include: int_strip.yaml
11 changes: 11 additions & 0 deletions common_patches/spi_dma_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
DMA_INT_RAW:
_strip_end: _INT_RAW
DMA_INT_ST:
_strip_end: _INT_ST
DMA_INT_ENA:
_strip_end: _INT_ENA
DMA_INT_CLR:
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
11 changes: 11 additions & 0 deletions common_patches/tim_int_strip.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
INT_RAW_TIMERS:
_strip_end: _INT_RAW
INT_ST_TIMERS:
_strip_end: _INT_ST
INT_ENA_TIMERS:
_strip_end: _INT_ENA
INT_CLR_TIMERS:
_strip_end: _INT_CLR
_modify:
"*":
modifiedWriteValues: oneToClear
18 changes: 9 additions & 9 deletions esp32/src/efuse/int_clr.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#[doc = "Register `INT_CLR` writer"]
pub type W = crate::W<INT_CLR_SPEC>;
#[doc = "Field `READ_DONE_INT_CLR` writer - "]
pub type READ_DONE_INT_CLR_W<'a, REG> = crate::BitWriter<'a, REG>;
#[doc = "Field `PGM_DONE_INT_CLR` writer - "]
pub type PGM_DONE_INT_CLR_W<'a, REG> = crate::BitWriter<'a, REG>;
#[doc = "Field `READ_DONE` writer - "]
pub type READ_DONE_W<'a, REG> = crate::BitWriter1C<'a, REG>;
#[doc = "Field `PGM_DONE` writer - "]
pub type PGM_DONE_W<'a, REG> = crate::BitWriter1C<'a, REG>;
#[cfg(feature = "impl-register-debug")]
impl core::fmt::Debug for crate::generic::Reg<INT_CLR_SPEC> {
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
Expand All @@ -14,14 +14,14 @@ impl W {
#[doc = "Bit 0"]
#[inline(always)]
#[must_use]
pub fn read_done_int_clr(&mut self) -> READ_DONE_INT_CLR_W<INT_CLR_SPEC> {
READ_DONE_INT_CLR_W::new(self, 0)
pub fn read_done(&mut self) -> READ_DONE_W<INT_CLR_SPEC> {
READ_DONE_W::new(self, 0)
}
#[doc = "Bit 1"]
#[inline(always)]
#[must_use]
pub fn pgm_done_int_clr(&mut self) -> PGM_DONE_INT_CLR_W<INT_CLR_SPEC> {
PGM_DONE_INT_CLR_W::new(self, 1)
pub fn pgm_done(&mut self) -> PGM_DONE_W<INT_CLR_SPEC> {
PGM_DONE_W::new(self, 1)
}
}
#[doc = "\n\nYou can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`int_clr::W`](W). See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
Expand All @@ -33,7 +33,7 @@ impl crate::RegisterSpec for INT_CLR_SPEC {
impl crate::Writable for INT_CLR_SPEC {
type Safety = crate::Unsafe;
const ZERO_TO_MODIFY_FIELDS_BITMAP: u32 = 0;
const ONE_TO_MODIFY_FIELDS_BITMAP: u32 = 0;
const ONE_TO_MODIFY_FIELDS_BITMAP: u32 = 0x03;
}
#[doc = "`reset()` method sets INT_CLR to value 0"]
impl crate::Resettable for INT_CLR_SPEC {
Expand Down
42 changes: 18 additions & 24 deletions esp32/src/efuse/int_ena.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,38 +2,32 @@
pub type R = crate::R<INT_ENA_SPEC>;
#[doc = "Register `INT_ENA` writer"]
pub type W = crate::W<INT_ENA_SPEC>;
#[doc = "Field `READ_DONE_INT_ENA` reader - "]
pub type READ_DONE_INT_ENA_R = crate::BitReader;
#[doc = "Field `READ_DONE_INT_ENA` writer - "]
pub type READ_DONE_INT_ENA_W<'a, REG> = crate::BitWriter<'a, REG>;
#[doc = "Field `PGM_DONE_INT_ENA` reader - "]
pub type PGM_DONE_INT_ENA_R = crate::BitReader;
#[doc = "Field `PGM_DONE_INT_ENA` writer - "]
pub type PGM_DONE_INT_ENA_W<'a, REG> = crate::BitWriter<'a, REG>;
#[doc = "Field `READ_DONE` reader - "]
pub type READ_DONE_R = crate::BitReader;
#[doc = "Field `READ_DONE` writer - "]
pub type READ_DONE_W<'a, REG> = crate::BitWriter<'a, REG>;
#[doc = "Field `PGM_DONE` reader - "]
pub type PGM_DONE_R = crate::BitReader;
#[doc = "Field `PGM_DONE` writer - "]
pub type PGM_DONE_W<'a, REG> = crate::BitWriter<'a, REG>;
impl R {
#[doc = "Bit 0"]
#[inline(always)]
pub fn read_done_int_ena(&self) -> READ_DONE_INT_ENA_R {
READ_DONE_INT_ENA_R::new((self.bits & 1) != 0)
pub fn read_done(&self) -> READ_DONE_R {
READ_DONE_R::new((self.bits & 1) != 0)
}
#[doc = "Bit 1"]
#[inline(always)]
pub fn pgm_done_int_ena(&self) -> PGM_DONE_INT_ENA_R {
PGM_DONE_INT_ENA_R::new(((self.bits >> 1) & 1) != 0)
pub fn pgm_done(&self) -> PGM_DONE_R {
PGM_DONE_R::new(((self.bits >> 1) & 1) != 0)
}
}
#[cfg(feature = "impl-register-debug")]
impl core::fmt::Debug for R {
fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
f.debug_struct("INT_ENA")
.field(
"read_done_int_ena",
&format_args!("{}", self.read_done_int_ena().bit()),
)
.field(
"pgm_done_int_ena",
&format_args!("{}", self.pgm_done_int_ena().bit()),
)
.field("read_done", &format_args!("{}", self.read_done().bit()))
.field("pgm_done", &format_args!("{}", self.pgm_done().bit()))
.finish()
}
}
Expand All @@ -47,14 +41,14 @@ impl W {
#[doc = "Bit 0"]
#[inline(always)]
#[must_use]
pub fn read_done_int_ena(&mut self) -> READ_DONE_INT_ENA_W<INT_ENA_SPEC> {
READ_DONE_INT_ENA_W::new(self, 0)
pub fn read_done(&mut self) -> READ_DONE_W<INT_ENA_SPEC> {
READ_DONE_W::new(self, 0)
}
#[doc = "Bit 1"]
#[inline(always)]
#[must_use]
pub fn pgm_done_int_ena(&mut self) -> PGM_DONE_INT_ENA_W<INT_ENA_SPEC> {
PGM_DONE_INT_ENA_W::new(self, 1)
pub fn pgm_done(&mut self) -> PGM_DONE_W<INT_ENA_SPEC> {
PGM_DONE_W::new(self, 1)
}
}
#[doc = "\n\nYou can [`read`](crate::generic::Reg::read) this register and get [`int_ena::R`](R). You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`int_ena::W`](W). You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api)."]
Expand Down
26 changes: 10 additions & 16 deletions esp32/src/efuse/int_raw.rs
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
#[doc = "Register `INT_RAW` reader"]
pub type R = crate::R<INT_RAW_SPEC>;
#[doc = "Field `READ_DONE_INT_RAW` reader - "]
pub type READ_DONE_INT_RAW_R = crate::BitReader;
#[doc = "Field `PGM_DONE_INT_RAW` reader - "]
pub type PGM_DONE_INT_RAW_R = crate::BitReader;
#[doc = "Field `READ_DONE` reader - "]
pub type READ_DONE_R = crate::BitReader;
#[doc = "Field `PGM_DONE` reader - "]
pub type PGM_DONE_R = crate::BitReader;
impl R {
#[doc = "Bit 0"]
#[inline(always)]
pub fn read_done_int_raw(&self) -> READ_DONE_INT_RAW_R {
READ_DONE_INT_RAW_R::new((self.bits & 1) != 0)
pub fn read_done(&self) -> READ_DONE_R {
READ_DONE_R::new((self.bits & 1) != 0)
}
#[doc = "Bit 1"]
#[inline(always)]
pub fn pgm_done_int_raw(&self) -> PGM_DONE_INT_RAW_R {
PGM_DONE_INT_RAW_R::new(((self.bits >> 1) & 1) != 0)
pub fn pgm_done(&self) -> PGM_DONE_R {
PGM_DONE_R::new(((self.bits >> 1) & 1) != 0)
}
}
#[cfg(feature = "impl-register-debug")]
impl core::fmt::Debug for R {
fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
f.debug_struct("INT_RAW")
.field(
"read_done_int_raw",
&format_args!("{}", self.read_done_int_raw().bit()),
)
.field(
"pgm_done_int_raw",
&format_args!("{}", self.pgm_done_int_raw().bit()),
)
.field("read_done", &format_args!("{}", self.read_done().bit()))
.field("pgm_done", &format_args!("{}", self.pgm_done().bit()))
.finish()
}
}
Expand Down
26 changes: 10 additions & 16 deletions esp32/src/efuse/int_st.rs
Original file line number Diff line number Diff line change
@@ -1,33 +1,27 @@
#[doc = "Register `INT_ST` reader"]
pub type R = crate::R<INT_ST_SPEC>;
#[doc = "Field `READ_DONE_INT_ST` reader - "]
pub type READ_DONE_INT_ST_R = crate::BitReader;
#[doc = "Field `PGM_DONE_INT_ST` reader - "]
pub type PGM_DONE_INT_ST_R = crate::BitReader;
#[doc = "Field `READ_DONE` reader - "]
pub type READ_DONE_R = crate::BitReader;
#[doc = "Field `PGM_DONE` reader - "]
pub type PGM_DONE_R = crate::BitReader;
impl R {
#[doc = "Bit 0"]
#[inline(always)]
pub fn read_done_int_st(&self) -> READ_DONE_INT_ST_R {
READ_DONE_INT_ST_R::new((self.bits & 1) != 0)
pub fn read_done(&self) -> READ_DONE_R {
READ_DONE_R::new((self.bits & 1) != 0)
}
#[doc = "Bit 1"]
#[inline(always)]
pub fn pgm_done_int_st(&self) -> PGM_DONE_INT_ST_R {
PGM_DONE_INT_ST_R::new(((self.bits >> 1) & 1) != 0)
pub fn pgm_done(&self) -> PGM_DONE_R {
PGM_DONE_R::new(((self.bits >> 1) & 1) != 0)
}
}
#[cfg(feature = "impl-register-debug")]
impl core::fmt::Debug for R {
fn fmt(&self, f: &mut core::fmt::Formatter) -> core::fmt::Result {
f.debug_struct("INT_ST")
.field(
"read_done_int_st",
&format_args!("{}", self.read_done_int_st().bit()),
)
.field(
"pgm_done_int_st",
&format_args!("{}", self.pgm_done_int_st().bit()),
)
.field("read_done", &format_args!("{}", self.read_done().bit()))
.field("pgm_done", &format_args!("{}", self.pgm_done().bit()))
.finish()
}
}
Expand Down
12 changes: 6 additions & 6 deletions esp32/src/i2c0.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pub struct RegisterBlock {
int_raw: INT_RAW,
int_clr: INT_CLR,
int_ena: INT_ENA,
int_status: INT_STATUS,
int_st: INT_ST,
sda_hold: SDA_HOLD,
sda_sample: SDA_SAMPLE,
scl_high_period: SCL_HIGH_PERIOD,
Expand Down Expand Up @@ -88,8 +88,8 @@ impl RegisterBlock {
}
#[doc = "0x2c - "]
#[inline(always)]
pub const fn int_status(&self) -> &INT_STATUS {
&self.int_status
pub const fn int_st(&self) -> &INT_ST {
&self.int_st
}
#[doc = "0x30 - "]
#[inline(always)]
Expand Down Expand Up @@ -202,10 +202,10 @@ pub mod int_clr;
pub type INT_ENA = crate::Reg<int_ena::INT_ENA_SPEC>;
#[doc = ""]
pub mod int_ena;
#[doc = "INT_STATUS (r) register accessor: \n\nYou can [`read`](crate::generic::Reg::read) this register and get [`int_status::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@int_status`] module"]
pub type INT_STATUS = crate::Reg<int_status::INT_STATUS_SPEC>;
#[doc = "INT_ST (r) register accessor: \n\nYou can [`read`](crate::generic::Reg::read) this register and get [`int_st::R`]. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@int_st`] module"]
pub type INT_ST = crate::Reg<int_st::INT_ST_SPEC>;
#[doc = ""]
pub mod int_status;
pub mod int_st;
#[doc = "SDA_HOLD (rw) register accessor: \n\nYou can [`read`](crate::generic::Reg::read) this register and get [`sda_hold::R`]. You can [`reset`](crate::generic::Reg::reset), [`write`](crate::generic::Reg::write), [`write_with_zero`](crate::generic::Reg::write_with_zero) this register using [`sda_hold::W`]. You can also [`modify`](crate::generic::Reg::modify) this register. See [API](https://docs.rs/svd2rust/#read--modify--write-api).\n\nFor information about available fields see [`mod@sda_hold`] module"]
pub type SDA_HOLD = crate::Reg<sda_hold::SDA_HOLD_SPEC>;
#[doc = ""]
Expand Down
Loading

0 comments on commit d8ed140

Please sign in to comment.