repr-u32

stm32-rs · Dec 6, 2023 · 26f646d · 26f646d
1 parent 0ffa14c
commit 26f646d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 29 deletions.
diff --git a/src/dma/mod.rs b/src/dma/mod.rs
@@ -301,7 +301,7 @@ impl Not for CurrentBuffer {
 
 /// Structure to get or set common interrupts setup
 #[enumflags2::bitflags]
-#[repr(u8)]
+#[repr(u32)]
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum DmaEvent {
     DirectModeError = 1 << 1,
@@ -331,7 +331,7 @@ impl DmaEventExt for BitFlags<DmaEvent> {
 
 /// Structure returned by Stream or Transfer flags() method.
 #[enumflags2::bitflags]
-#[repr(u8)]
+#[repr(u32)]
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum DmaFlag {
     FifoError = 1 << 0,
@@ -600,7 +600,7 @@ where
 
     #[inline(always)]
     fn events(&self) -> BitFlags<DmaEvent> {
-        BitFlags::from_bits_truncate(unsafe { Self::st() }.cr.read().bits() as u8)
+        BitFlags::from_bits_truncate(unsafe { Self::st() }.cr.read().bits())
     }
 
     #[inline(always)]
@@ -679,10 +679,10 @@ where
                 w.bits({
                     let mut bits = r.bits();
                     if let Some(d) = disable {
-                        bits &= !(d.bits() as u32)
+                        bits &= !d.bits()
                     }
                     if let Some(e) = enable {
-                        bits |= e.bits() as u32;
+                        bits |= e.bits();
                     }
                     bits
                 })
@@ -704,7 +704,7 @@ macro_rules! dma_stream {
                 #[inline(always)]
                 fn clear_flags(&mut self, flags: impl Into<BitFlags<DmaFlag>>) {
                     let dma = unsafe { &*I::ptr() };
-                    dma.$ifcr.write(|w| unsafe { w.bits((flags.into().bits() as u32) << $isr_shift) });
+                    dma.$ifcr.write(|w| unsafe { w.bits(flags.into().bits() << $isr_shift) });
                 }
             }
 
@@ -717,7 +717,7 @@ macro_rules! dma_stream {
                     //NOTE(unsafe) Atomic read with no side effects
                     let dma = unsafe { &*I::ptr() };
                     BitFlags::from_bits_truncate(
-                        ((dma.$isr.read().bits() >> $isr_shift)) as u8
+                        ((dma.$isr.read().bits() >> $isr_shift))
                     )
                 }
             }

diff --git a/src/serial.rs b/src/serial.rs
@@ -54,7 +54,7 @@ pub enum Error {
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u16)]
+#[repr(u32)]
 pub enum Event {
     /// IDLE interrupt enable
     Idle = 1 << 4,
@@ -72,7 +72,7 @@ pub enum Event {
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u16)]
+#[repr(u32)]
 pub enum Flag {
     /// Parity error
     ParityError = 1 << 0,
@@ -100,7 +100,7 @@ pub enum Flag {
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u16)]
+#[repr(u32)]
 pub enum CFlag {
     /// Read data register not empty
     RxNotEmpty = 1 << 5,

diff --git a/src/serial/uart_impls.rs b/src/serial/uart_impls.rs
@@ -282,12 +282,11 @@ macro_rules! uartCommon {
             }
 
             fn flags(&self) -> BitFlags<Flag> {
-                BitFlags::from_bits_truncate(self.sr.read().bits() as u16)
+                BitFlags::from_bits_truncate(self.sr.read().bits())
             }
 
             fn clear_flags(&self, flags: BitFlags<CFlag>) {
-                self.sr
-                    .write(|w| unsafe { w.bits(0xffff & !(flags.bits() as u32)) });
+                self.sr.write(|w| unsafe { w.bits(0xffff & !flags.bits()) });
             }
 
             fn clear_idle_interrupt(&self) {

diff --git a/src/spi.rs b/src/spi.rs
@@ -4,7 +4,7 @@ use core::ops::{Deref, DerefMut};
 use crate::dma::traits::{DMASet, PeriAddress};
 use crate::dma::{MemoryToPeripheral, PeripheralToMemory};
 use crate::gpio::{self, NoPin};
-use crate::{pac, ClearFlags, ReadFlags};
+use crate::{pac, ReadFlags};
 
 /// Clock polarity
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -67,7 +67,7 @@ pub type NoMosi = NoPin;
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u8)]
+#[repr(u32)]
 pub enum Event {
     /// An error occurred.
     ///
@@ -90,7 +90,7 @@ pub enum Event {
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u16)]
+#[repr(u32)]
 pub enum Flag {
     /// Receive buffer not empty
     RxNotEmpty = 1 << 0,
@@ -112,7 +112,7 @@ pub enum Flag {
 #[enumflags2::bitflags]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-#[repr(u16)]
+#[repr(u32)]
 pub enum CFlag {
     /// CRC error flag
     CrcError = 1 << 4,
@@ -788,7 +788,7 @@ impl<SPI: Instance> Inner<SPI> {
             Error::ModeFault.into()
         } else if flags.contains(Flag::CrcError) {
             // Clear the CRCERR bit
-            self.clear_flags(CFlag::CrcError);
+            self.spi.sr.modify(|_r, w| w.crcerr().clear_bit());
             Error::Crc.into()
         } else if flags.contains(Flag::TxEmpty) {
             self.write_data_reg(byte);
@@ -802,10 +802,10 @@ impl<SPI: Instance> Inner<SPI> {
             w.bits({
                 let mut bits = r.bits();
                 if let Some(d) = disable {
-                    bits &= !(d.bits() as u32)
+                    bits &= !d.bits();
                 }
                 if let Some(e) = enable {
-                    bits |= e.bits() as u32;
+                    bits |= e.bits();
                 }
                 bits
             })
@@ -831,18 +831,19 @@ impl<SPI: Instance> crate::Listen for Inner<SPI> {
 
 impl<SPI: Instance> crate::ClearFlags for Inner<SPI> {
     type Flag = CFlag;
-    fn clear_flags(&mut self, event: impl Into<BitFlags<Self::Flag>>) {
-        // TODO: check
-        self.spi
-            .sr
-            .write(|w| unsafe { w.bits(0xffff & !(event.into().bits() as u32)) });
+    fn clear_flags(&mut self, flags: impl Into<BitFlags<Self::Flag>>) {
+        if flags.into().contains(CFlag::CrcError) {
+            self.spi
+                .sr
+                .write(|w| unsafe { w.bits(0xffff).crcerr().clear_bit() })
+        }
     }
 }
 
 impl<SPI: Instance> crate::ReadFlags for Inner<SPI> {
     type Flag = Flag;
     fn flags(&self) -> BitFlags<Self::Flag> {
-        BitFlags::from_bits_truncate(self.spi.sr.read().bits() as u16)
+        BitFlags::from_bits_truncate(self.spi.sr.read().bits())
     }
 }
 

diff --git a/src/timer.rs b/src/timer.rs
@@ -90,7 +90,7 @@ pub enum SysEvent {
 
 /// TIM interrupt events
 #[enumflags2::bitflags]
-#[repr(u8)]
+#[repr(u32)]
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum Event {
@@ -114,7 +114,7 @@ pub enum Event {
 
 /// TIM status flags
 #[enumflags2::bitflags]
-#[repr(u16)]
+#[repr(u32)]
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
 pub enum Flag {
@@ -450,7 +450,7 @@ macro_rules! hal {
             }
             #[inline(always)]
             fn get_interrupt_flag(&self) -> BitFlags<Flag> {
-                BitFlags::from_bits_truncate(self.sr.read().bits() as u16)
+                BitFlags::from_bits_truncate(self.sr.read().bits())
             }
             #[inline(always)]
             fn read_count(&self) -> Self::Width {