aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2022-06-06 22:35:47 +0000
committerGitHub <[email protected]>2022-06-06 22:35:47 +0000
commitad6943adb3e52e5bb052a1a21a331f06af8c12f7 (patch)
tree6b3a6e9f91d4103a599f5286cc6eb371bdda04a4
parent62add4b2ab4eb2ba19d51e119774ffcb258c63fe (diff)
parent0aa73f58e2f71f4578ff23f79f3b1a2c9d6d9098 (diff)
Merge #795
795: Update stm32-metapac. r=Dirbaio a=Dirbaio Co-authored-by: Dario Nieuwenhuis <[email protected]>
-rw-r--r--embassy-stm32/src/crc/v2v3.rs8
m---------stm32-data0
-rw-r--r--stm32-metapac-gen/Cargo.toml2
3 files changed, 5 insertions, 5 deletions
diff --git a/embassy-stm32/src/crc/v2v3.rs b/embassy-stm32/src/crc/v2v3.rs
index 77cd3da1a..08e40a116 100644
--- a/embassy-stm32/src/crc/v2v3.rs
+++ b/embassy-stm32/src/crc/v2v3.rs
@@ -133,7 +133,7 @@ impl<'d> Crc<'d> {
133 /// Feeds a byte into the CRC peripheral. Returns the computed checksum. 133 /// Feeds a byte into the CRC peripheral. Returns the computed checksum.
134 pub fn feed_byte(&mut self, byte: u8) -> u32 { 134 pub fn feed_byte(&mut self, byte: u8) -> u32 {
135 unsafe { 135 unsafe {
136 PAC_CRC.dr8().write_value(byte as u32); 136 PAC_CRC.dr8().write_value(byte);
137 PAC_CRC.dr().read() 137 PAC_CRC.dr().read()
138 } 138 }
139 } 139 }
@@ -142,7 +142,7 @@ impl<'d> Crc<'d> {
142 pub fn feed_bytes(&mut self, bytes: &[u8]) -> u32 { 142 pub fn feed_bytes(&mut self, bytes: &[u8]) -> u32 {
143 for byte in bytes { 143 for byte in bytes {
144 unsafe { 144 unsafe {
145 PAC_CRC.dr8().write_value(*byte as u32); 145 PAC_CRC.dr8().write_value(*byte);
146 } 146 }
147 } 147 }
148 unsafe { PAC_CRC.dr().read() } 148 unsafe { PAC_CRC.dr().read() }
@@ -150,7 +150,7 @@ impl<'d> Crc<'d> {
150 /// Feeds a halfword into the CRC peripheral. Returns the computed checksum. 150 /// Feeds a halfword into the CRC peripheral. Returns the computed checksum.
151 pub fn feed_halfword(&mut self, halfword: u16) -> u32 { 151 pub fn feed_halfword(&mut self, halfword: u16) -> u32 {
152 unsafe { 152 unsafe {
153 PAC_CRC.dr16().write_value(halfword as u32); 153 PAC_CRC.dr16().write_value(halfword);
154 PAC_CRC.dr().read() 154 PAC_CRC.dr().read()
155 } 155 }
156 } 156 }
@@ -158,7 +158,7 @@ impl<'d> Crc<'d> {
158 pub fn feed_halfwords(&mut self, halfwords: &[u16]) -> u32 { 158 pub fn feed_halfwords(&mut self, halfwords: &[u16]) -> u32 {
159 for halfword in halfwords { 159 for halfword in halfwords {
160 unsafe { 160 unsafe {
161 PAC_CRC.dr16().write_value(*halfword as u32); 161 PAC_CRC.dr16().write_value(*halfword);
162 } 162 }
163 } 163 }
164 unsafe { PAC_CRC.dr().read() } 164 unsafe { PAC_CRC.dr().read() }
diff --git a/stm32-data b/stm32-data
Subproject b2d7a9f5de7dc3ae17c87c1ff94e13a822d18e7 Subproject aa2e63996c0fe35d680c9c48917c07b042905e4
diff --git a/stm32-metapac-gen/Cargo.toml b/stm32-metapac-gen/Cargo.toml
index 0e10b21e4..5cf142083 100644
--- a/stm32-metapac-gen/Cargo.toml
+++ b/stm32-metapac-gen/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
6 6
7[dependencies] 7[dependencies]
8regex = "1.5.4" 8regex = "1.5.4"
9chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "d5c0f6174ec7f03b5004042b788fb9fddcc7c34f" } 9chiptool = { git = "https://github.com/embassy-rs/chiptool", rev = "28ffa8a19d84914089547f52900ffb5877a5dc23" }
10serde = { version = "1.0.130", features = [ "derive" ] } 10serde = { version = "1.0.130", features = [ "derive" ] }
11serde_yaml = "0.8.21" 11serde_yaml = "0.8.21"
12proc-macro2 = "1.0.29" 12proc-macro2 = "1.0.29"