diff --git a/data/registers/otg_v2.json b/data/registers/otg_v2.json index 699a98a1..91cbb45b 100644 --- a/data/registers/otg_v2.json +++ b/data/registers/otg_v2.json @@ -717,54 +717,60 @@ ] }, "fieldset/DOEPCTL": { - "description": "This section describes the DOEPCTL0 register.", + "description": "Device endpoint control register", "fields": [ { "name": "MPSIZ", - "description": "MPSIZ.", + "description": "MPSIZ", "bit_offset": 0, - "bit_size": 2 + "bit_size": 11 }, { "name": "USBAEP", - "description": "USBAEP.", + "description": "USBAEP", "bit_offset": 15, "bit_size": 1 }, + { + "name": "EONUM_DPID", + "description": "EONUM/DPID", + "bit_offset": 16, + "bit_size": 1 + }, { "name": "NAKSTS", - "description": "NAKSTS.", + "description": "NAKSTS", "bit_offset": 17, "bit_size": 1 }, { "name": "EPTYP", - "description": "EPTYP.", + "description": "EPTYP", "bit_offset": 18, "bit_size": 2, "enum": "EPTYP" }, { "name": "SNPM", - "description": "SNPM.", + "description": "SNPM", "bit_offset": 20, "bit_size": 1 }, { "name": "STALL", - "description": "STALL.", + "description": "STALL", "bit_offset": 21, "bit_size": 1 }, { "name": "CNAK", - "description": "CNAK.", + "description": "CNAK", "bit_offset": 26, "bit_size": 1 }, { "name": "SNAK", - "description": "SNAK.", + "description": "SNAK", "bit_offset": 27, "bit_size": 1 }, @@ -775,20 +781,20 @@ "bit_size": 1 }, { - "name": "SODDFRM_SD1PID", - "description": "SODDFRM/SD1PID", + "name": "SODDFRM", + "description": "SODDFRM", "bit_offset": 29, "bit_size": 1 }, { "name": "EPDIS", - "description": "EPDIS.", + "description": "EPDIS", "bit_offset": 30, "bit_size": 1 }, { "name": "EPENA", - "description": "EPENA.", + "description": "EPENA", "bit_offset": 31, "bit_size": 1 } diff --git a/stm32-metapac/src/peripherals/otg_v2.rs b/stm32-metapac/src/peripherals/otg_v2.rs index 17a35c75..2fc9418a 100644 --- a/stm32-metapac/src/peripherals/otg_v2.rs +++ b/stm32-metapac/src/peripherals/otg_v2.rs @@ -365,56 +365,60 @@ pub fn set_pktcnt (& mut self , val : u16) { self . 0 = (self . 0 & ! (0x03ff << pub const fn mcnt (& self) -> u8 { let val = (self . 0 >> 29usize) & 0x03 ; val as u8 } # [doc = "Multi count"] # [inline (always)] pub fn set_mcnt (& mut self , val : u8) { self . 0 = (self . 0 & ! (0x03 << 29usize)) | (((val as u32) & 0x03) << 29usize) ; } } impl Default for Dieptsiz { # [inline (always)] -fn default () -> Dieptsiz { Dieptsiz (0) } } # [doc = "This section describes the DOEPCTL0 register."] +fn default () -> Dieptsiz { Dieptsiz (0) } } # [doc = "Device endpoint control register"] # [repr (transparent)] # [derive (Copy , Clone , Eq , PartialEq)] -pub struct Doepctl (pub u32) ; impl Doepctl { # [doc = "MPSIZ."] +pub struct Doepctl (pub u32) ; impl Doepctl { # [doc = "MPSIZ"] # [inline (always)] -pub const fn mpsiz (& self) -> u8 { let val = (self . 0 >> 0usize) & 0x03 ; val as u8 } # [doc = "MPSIZ."] +pub const fn mpsiz (& self) -> u16 { let val = (self . 0 >> 0usize) & 0x07ff ; val as u16 } # [doc = "MPSIZ"] # [inline (always)] -pub fn set_mpsiz (& mut self , val : u8) { self . 0 = (self . 0 & ! (0x03 << 0usize)) | (((val as u32) & 0x03) << 0usize) ; } # [doc = "USBAEP."] +pub fn set_mpsiz (& mut self , val : u16) { self . 0 = (self . 0 & ! (0x07ff << 0usize)) | (((val as u32) & 0x07ff) << 0usize) ; } # [doc = "USBAEP"] # [inline (always)] -pub const fn usbaep (& self) -> bool { let val = (self . 0 >> 15usize) & 0x01 ; val != 0 } # [doc = "USBAEP."] +pub const fn usbaep (& self) -> bool { let val = (self . 0 >> 15usize) & 0x01 ; val != 0 } # [doc = "USBAEP"] # [inline (always)] -pub fn set_usbaep (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 15usize)) | (((val as u32) & 0x01) << 15usize) ; } # [doc = "NAKSTS."] +pub fn set_usbaep (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 15usize)) | (((val as u32) & 0x01) << 15usize) ; } # [doc = "EONUM/DPID"] # [inline (always)] -pub const fn naksts (& self) -> bool { let val = (self . 0 >> 17usize) & 0x01 ; val != 0 } # [doc = "NAKSTS."] +pub const fn eonum_dpid (& self) -> bool { let val = (self . 0 >> 16usize) & 0x01 ; val != 0 } # [doc = "EONUM/DPID"] # [inline (always)] -pub fn set_naksts (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize) ; } # [doc = "EPTYP."] +pub fn set_eonum_dpid (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 16usize)) | (((val as u32) & 0x01) << 16usize) ; } # [doc = "NAKSTS"] # [inline (always)] -pub const fn eptyp (& self) -> super :: vals :: Eptyp { let val = (self . 0 >> 18usize) & 0x03 ; super :: vals :: Eptyp :: from_bits (val as u8) } # [doc = "EPTYP."] +pub const fn naksts (& self) -> bool { let val = (self . 0 >> 17usize) & 0x01 ; val != 0 } # [doc = "NAKSTS"] # [inline (always)] -pub fn set_eptyp (& mut self , val : super :: vals :: Eptyp) { self . 0 = (self . 0 & ! (0x03 << 18usize)) | (((val . to_bits () as u32) & 0x03) << 18usize) ; } # [doc = "SNPM."] +pub fn set_naksts (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 17usize)) | (((val as u32) & 0x01) << 17usize) ; } # [doc = "EPTYP"] # [inline (always)] -pub const fn snpm (& self) -> bool { let val = (self . 0 >> 20usize) & 0x01 ; val != 0 } # [doc = "SNPM."] +pub const fn eptyp (& self) -> super :: vals :: Eptyp { let val = (self . 0 >> 18usize) & 0x03 ; super :: vals :: Eptyp :: from_bits (val as u8) } # [doc = "EPTYP"] # [inline (always)] -pub fn set_snpm (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 20usize)) | (((val as u32) & 0x01) << 20usize) ; } # [doc = "STALL."] +pub fn set_eptyp (& mut self , val : super :: vals :: Eptyp) { self . 0 = (self . 0 & ! (0x03 << 18usize)) | (((val . to_bits () as u32) & 0x03) << 18usize) ; } # [doc = "SNPM"] # [inline (always)] -pub const fn stall (& self) -> bool { let val = (self . 0 >> 21usize) & 0x01 ; val != 0 } # [doc = "STALL."] +pub const fn snpm (& self) -> bool { let val = (self . 0 >> 20usize) & 0x01 ; val != 0 } # [doc = "SNPM"] # [inline (always)] -pub fn set_stall (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize) ; } # [doc = "CNAK."] +pub fn set_snpm (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 20usize)) | (((val as u32) & 0x01) << 20usize) ; } # [doc = "STALL"] # [inline (always)] -pub const fn cnak (& self) -> bool { let val = (self . 0 >> 26usize) & 0x01 ; val != 0 } # [doc = "CNAK."] +pub const fn stall (& self) -> bool { let val = (self . 0 >> 21usize) & 0x01 ; val != 0 } # [doc = "STALL"] # [inline (always)] -pub fn set_cnak (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize) ; } # [doc = "SNAK."] +pub fn set_stall (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 21usize)) | (((val as u32) & 0x01) << 21usize) ; } # [doc = "CNAK"] # [inline (always)] -pub const fn snak (& self) -> bool { let val = (self . 0 >> 27usize) & 0x01 ; val != 0 } # [doc = "SNAK."] +pub const fn cnak (& self) -> bool { let val = (self . 0 >> 26usize) & 0x01 ; val != 0 } # [doc = "CNAK"] +# [inline (always)] +pub fn set_cnak (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 26usize)) | (((val as u32) & 0x01) << 26usize) ; } # [doc = "SNAK"] +# [inline (always)] +pub const fn snak (& self) -> bool { let val = (self . 0 >> 27usize) & 0x01 ; val != 0 } # [doc = "SNAK"] # [inline (always)] pub fn set_snak (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 27usize)) | (((val as u32) & 0x01) << 27usize) ; } # [doc = "SD0PID/SEVNFRM"] # [inline (always)] pub const fn sd0pid_sevnfrm (& self) -> bool { let val = (self . 0 >> 28usize) & 0x01 ; val != 0 } # [doc = "SD0PID/SEVNFRM"] # [inline (always)] -pub fn set_sd0pid_sevnfrm (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 28usize)) | (((val as u32) & 0x01) << 28usize) ; } # [doc = "SODDFRM/SD1PID"] +pub fn set_sd0pid_sevnfrm (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 28usize)) | (((val as u32) & 0x01) << 28usize) ; } # [doc = "SODDFRM"] # [inline (always)] -pub const fn soddfrm_sd1pid (& self) -> bool { let val = (self . 0 >> 29usize) & 0x01 ; val != 0 } # [doc = "SODDFRM/SD1PID"] +pub const fn soddfrm (& self) -> bool { let val = (self . 0 >> 29usize) & 0x01 ; val != 0 } # [doc = "SODDFRM"] # [inline (always)] -pub fn set_soddfrm_sd1pid (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 29usize)) | (((val as u32) & 0x01) << 29usize) ; } # [doc = "EPDIS."] +pub fn set_soddfrm (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 29usize)) | (((val as u32) & 0x01) << 29usize) ; } # [doc = "EPDIS"] # [inline (always)] -pub const fn epdis (& self) -> bool { let val = (self . 0 >> 30usize) & 0x01 ; val != 0 } # [doc = "EPDIS."] +pub const fn epdis (& self) -> bool { let val = (self . 0 >> 30usize) & 0x01 ; val != 0 } # [doc = "EPDIS"] # [inline (always)] -pub fn set_epdis (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 30usize)) | (((val as u32) & 0x01) << 30usize) ; } # [doc = "EPENA."] +pub fn set_epdis (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 30usize)) | (((val as u32) & 0x01) << 30usize) ; } # [doc = "EPENA"] # [inline (always)] -pub const fn epena (& self) -> bool { let val = (self . 0 >> 31usize) & 0x01 ; val != 0 } # [doc = "EPENA."] +pub const fn epena (& self) -> bool { let val = (self . 0 >> 31usize) & 0x01 ; val != 0 } # [doc = "EPENA"] # [inline (always)] pub fn set_epena (& mut self , val : bool) { self . 0 = (self . 0 & ! (0x01 << 31usize)) | (((val as u32) & 0x01) << 31usize) ; } } impl Default for Doepctl { # [inline (always)] fn default () -> Doepctl { Doepctl (0) } } # [doc = "OTG device OUT endpoint 0 DMA address register."] diff --git a/stm32-metapac/src/registers/otg_v2.rs b/stm32-metapac/src/registers/otg_v2.rs index e05feb45..b3840e5b 100644 --- a/stm32-metapac/src/registers/otg_v2.rs +++ b/stm32-metapac/src/registers/otg_v2.rs @@ -1754,28 +1754,28 @@ name: "Doepctl", extends: None, description: Some( - "This section describes the DOEPCTL0 register.", + "Device endpoint control register", ), bit_size: 32, fields: &[ Field { name: "mpsiz", description: Some( - "MPSIZ.", + "MPSIZ", ), bit_offset: BitOffset::Regular( RegularBitOffset { offset: 0, }, ), - bit_size: 2, + bit_size: 11, array: None, enumm: None, }, Field { name: "usbaep", description: Some( - "USBAEP.", + "USBAEP", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1786,10 +1786,24 @@ array: None, enumm: None, }, + Field { + name: "eonum_dpid", + description: Some( + "EONUM/DPID", + ), + bit_offset: BitOffset::Regular( + RegularBitOffset { + offset: 16, + }, + ), + bit_size: 1, + array: None, + enumm: None, + }, Field { name: "naksts", description: Some( - "NAKSTS.", + "NAKSTS", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1803,7 +1817,7 @@ Field { name: "eptyp", description: Some( - "EPTYP.", + "EPTYP", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1819,7 +1833,7 @@ Field { name: "snpm", description: Some( - "SNPM.", + "SNPM", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1833,7 +1847,7 @@ Field { name: "stall", description: Some( - "STALL.", + "STALL", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1847,7 +1861,7 @@ Field { name: "cnak", description: Some( - "CNAK.", + "CNAK", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1861,7 +1875,7 @@ Field { name: "snak", description: Some( - "SNAK.", + "SNAK", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1887,9 +1901,9 @@ enumm: None, }, Field { - name: "soddfrm_sd1pid", + name: "soddfrm", description: Some( - "SODDFRM/SD1PID", + "SODDFRM", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1903,7 +1917,7 @@ Field { name: "epdis", description: Some( - "EPDIS.", + "EPDIS", ), bit_offset: BitOffset::Regular( RegularBitOffset { @@ -1917,7 +1931,7 @@ Field { name: "epena", description: Some( - "EPENA.", + "EPENA", ), bit_offset: BitOffset::Regular( RegularBitOffset {