fix CRC

Author: dotcypress

examples/crc.rs

@@ -8,7 +8,7 @@ extern crate cortex_m_rt as rt;
 extern crate panic_halt;
 extern crate stm32g0xx_hal as hal;
 
-use cortex_m_semihosting::hprintln;
+use defmt_rtt as _;
 use hal::crc::*;
 use hal::prelude::*;
 use hal::stm32;
@@ -25,24 +25,24 @@ fn main() -> ! {
         .output_bit_reversal(true)
         .freeze();
 
-    loop {
-        crc.reset();
-        crc.feed(b"123456789");
-
-        let hash_sum = crc.result();
-        hprintln!(
-            "crc32: 0x{:x}, crc32b: 0x{:x}",
-            hash_sum,
-            hash_sum ^ 0xffff_ffff
-        );
-
-        crc.reset();
-        crc.feed(b"The quick brown fox jumps over the lazy dog");
-        let hash_sum = crc.result();
-        hprintln!(
-            "crc32: 0x{:x}, crc32b: 0x{:x}",
-            hash_sum,
-            hash_sum ^ 0xffff_ffff
-        );
-    }
+    crc.reset();
+    crc.feed(b"123456789");
+
+    let hash_sum = crc.result();
+    defmt::info!(
+        "target: 0xcbf43926, crc32: 0x{:x}, crc32b: 0x{:x}",
+        hash_sum,
+        hash_sum ^ 0xffff_ffff
+    );
+
+    crc.reset();
+    crc.feed(b"The quick brown fox jumps over the lazy dog");
+    let hash_sum = crc.result();
+    defmt::info!(
+        "target: 0x414fa339, crc32: 0x{:x}, crc32b: 0x{:x}",
+        hash_sum,
+        hash_sum ^ 0xffff_ffff
+    );
+
+    loop {}
 }

src/crc.rs

@@ -173,7 +173,12 @@ impl Crc {
     pub fn feed(&mut self, data: &[u8]) {
         let crc = unsafe { &(*CRC::ptr()) };
         for byte in data {
-            crc.dr().write(|w| unsafe { w.dr().bits((*byte).into()) });
+            unsafe {
+                core::ptr::write_volatile(
+                    core::cell::UnsafeCell::<u8>::raw_get(crc.dr().as_ptr() as _),
+                    *byte,
+                )
+            }
         }
     }
 

src/spi.rs

@@ -3,7 +3,6 @@ use crate::rcc::*;
 use crate::stm32::{SPI1, SPI2};
 use crate::time::Hertz;
 use core::convert::Infallible;
-use core::ptr;
 use embedded_hal::delay::DelayNs;
 use hal::digital;
 use hal::digital::OutputPin;
@@ -310,7 +309,7 @@ macro_rules! spi {
                 } else if sr.crcerr().bit_is_set() {
                     nb::Error::Other(Error::Crc)
                 } else if sr.rxne().bit_is_set() {
-                    return Ok(self.spi.dr().read().bits() as u8);
+                    return Ok(self.spi.dr8().read().bits() as u8);
                 } else {
                     nb::Error::WouldBlock
                 })
@@ -325,9 +324,7 @@ macro_rules! spi {
                 } else if sr.crcerr().bit_is_set() {
                     nb::Error::Other(Error::Crc)
                 } else if sr.txe().bit_is_set() {
-                    unsafe {
-                        ptr::write_volatile(core::cell::UnsafeCell::raw_get(self.spi.dr() as *const _ as _), byte)
-                    }
+                    self.spi.dr8().write(|w| unsafe { w.dr().bits(byte as _) });
                     return Ok(());
                 } else {
                     nb::Error::WouldBlock