max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #795

Browse Source 
795: Update stm32-metapac. r=Dirbaio a=Dirbaio



Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>
This commit is contained in:
bors[bot] 2022-06-06 22:35:47 +00:00 committed by GitHub
commit ad6943adb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
embassy-stm32/src/crc/v2v3.rs
View File

@ -133,7 +133,7 @@ impl<'d> Crc<'d> {
/// Feeds a byte into the CRC peripheral. Returns the computed checksum. /// Feeds a byte into the CRC peripheral. Returns the computed checksum.
pub fn feed_byte(&mut self, byte: u8) -> u32 { pub fn feed_byte(&mut self, byte: u8) -> u32 {
unsafe { unsafe {
PAC_CRC.dr8().write_value(byte as u32); PAC_CRC.dr8().write_value(byte);
PAC_CRC.dr().read() PAC_CRC.dr().read()
} }
} }
@ -142,7 +142,7 @@ impl<'d> Crc<'d> {
pub fn feed_bytes(&mut self, bytes: &[u8]) -> u32 { pub fn feed_bytes(&mut self, bytes: &[u8]) -> u32 {
for byte in bytes { for byte in bytes {
unsafe { unsafe {
PAC_CRC.dr8().write_value(*byte as u32); PAC_CRC.dr8().write_value(*byte);
} }
} }
unsafe { PAC_CRC.dr().read() } unsafe { PAC_CRC.dr().read() }
@ -150,7 +150,7 @@ impl<'d> Crc<'d> {
/// Feeds a halfword into the CRC peripheral. Returns the computed checksum. /// Feeds a halfword into the CRC peripheral. Returns the computed checksum.
pub fn feed_halfword(&mut self, halfword: u16) -> u32 { pub fn feed_halfword(&mut self, halfword: u16) -> u32 {
unsafe { unsafe {
PAC_CRC.dr16().write_value(halfword as u32); PAC_CRC.dr16().write_value(halfword);
PAC_CRC.dr().read() PAC_CRC.dr().read()
} }
} }
@ -158,7 +158,7 @@ impl<'d> Crc<'d> {
pub fn feed_halfwords(&mut self, halfwords: &[u16]) -> u32 { pub fn feed_halfwords(&mut self, halfwords: &[u16]) -> u32 {
for halfword in halfwords { for halfword in halfwords {
unsafe { unsafe {
PAC_CRC.dr16().write_value(*halfword as u32); PAC_CRC.dr16().write_value(*halfword);
} }
} }
unsafe { PAC_CRC.dr().read() } unsafe { PAC_CRC.dr().read() }

2
stm32-data

@ -1 +1 @@
Subproject commit b2d7a9f5de7dc3ae17c87c1ff94e13a822d18e74 Subproject commit aa2e63996c0fe35d680c9c48917c07b042905e4a

2
stm32-metapac-gen/Cargo.toml
View File

@ -6,7 +6,7 @@ edition = "2018"
[dependencies] [dependencies]
regex = "1.5.4" regex = "1.5.4"
chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "d5c0f6174ec7f03b5004042b788fb9fddcc7c34f" } chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "28ffa8a19d84914089547f52900ffb5877a5dc23" }
serde = { version = "1.0.130", features = [ "derive" ] } serde = { version = "1.0.130", features = [ "derive" ] }
serde_yaml = "0.8.21" serde_yaml = "0.8.21"
proc-macro2 = "1.0.29" proc-macro2 = "1.0.29"