Upgrade dependencies in public API

Bump bitflags to 2.0. I try to maintain as much backwards compatibility
as I can with 1.0, for convenience.

Upgrade defmt to 1.0. This should remain compatible with the 0.3 series,
given the way 1.0 is implemented. However, it could be nice to adopt
newer features as they arrive.

Upgrade imxrt-dma to 0.2. See the imxrt-dma CHANGELOG for more info. No
breaking Rust API changes, but we take on different dependencies.

Upgrade imxrt-usbd to 0.4. It's a dev dependency of imxrt-hal. However,
it's a public dependency of the logging package.

Update imxrt-rt to 0.1.8. The new release lets us pull in newer versions
of cortex-m-rt. That new implicit dependency is better suited for Rust
2024 patterns, particularly `static mut`.

Remove all patch directives from workspace. At this point, all
first-party packages should be on crates.io. We don't need these right
now. It'll be OK with me to bring them back later.

Author: mciantyre

CHANGELOG.md

@@ -34,6 +34,11 @@ and other class packages.
 
 - `imxrt-ral` 0.6
 - `iomxrt-iomuxc` 0.3
+- `imxrt-dma` 0.2
+
+Additionally, update third-party dependencies in the public API:
+
+- `bitflags` 2.11
 
 **BREAKING** Remove deprecated APIs
 

Cargo.toml

@@ -22,7 +22,7 @@ version = "0.7"
 version = "1.0"
 
 [dependencies.bitflags]
-version = "1.3"
+version = "2.0"
 
 [dependencies.nb]
 version = "1"
@@ -100,7 +100,7 @@ eh02-unproven = []
 members = ["board", "logging"]
 
 [workspace.dependencies]
-imxrt-dma = "0.1"
+imxrt-dma = "0.2.0"
 imxrt-iomuxc = "0.3.0"
 imxrt-hal = { version = "0.6", path = "." }
 imxrt-log = { path = "logging", default-features = false, features = [
@@ -109,9 +109,9 @@ imxrt-log = { path = "logging", default-features = false, features = [
     "usbd",
 ] }
 imxrt-ral = "0.6"
-imxrt-rt = "0.1.5"
-imxrt-usbd = "0.3"
-defmt = "0.3"
+imxrt-rt = "0.1.8"
+imxrt-usbd = "0.4"
+defmt = "1.0"
 
 [workspace.package]
 repository = "https://github.com/imxrt-rs/imxrt-hal"
@@ -212,12 +212,3 @@ required-features = ["board/imxrt-log","board/sai","board/teensy4"]
 [[example]]
 name = "rtic_sai_sgtl5000"
 required-features = ["board/imxrt-log","board/sai","board/teensy4"]
-
-[patch.crates-io.imxrt-ral]
-git = "https://github.com/imxrt-rs/imxrt-ral"
-
-[patch.crates-io.imxrt-iomuxc]
-git = "https://github.com/imxrt-rs/imxrt-iomuxc"
-
-[patch.crates-io.imxrt-usbd]
-git = "https://github.com/imxrt-rs/imxrt-usbd"

board/Cargo.toml

@@ -6,7 +6,7 @@ edition = { workspace = true }
 publish = false
 
 [dependencies.defmt]
-version = "0.3"
+workspace = true
 
 [dependencies.imxrt-hal]
 workspace = true
@@ -31,7 +31,7 @@ default-features = false
 
 [dependencies.imxrt-usbd]
 workspace = true
-features = ["defmt-03"]
+features = ["defmt"]
 
 [dependencies.cortex-m]
 version = "0.7"

logging/CHANGELOG.md

@@ -5,7 +5,7 @@
 **BREAKING** Integrate breaking dependencies for the USB back-end:
 
 - `imxrt-ral` 0.6
-- `imxrt-usbd` 0.3
+- `imxrt-usbd` 0.4
 - `imxrt-hal` 0.6
 - `usb-device` 0.3
 - `usbd-serial` 0.2

logging/Cargo.toml

@@ -16,7 +16,7 @@ static_cell = "2.1.0"
 
 [dependencies.defmt]
 optional = true
-version = "0.3"
+workspace = true
 
 [dependencies.log]
 optional = true

src/chip/drivers/sai.rs

@@ -132,6 +132,7 @@ bitflags::bitflags! {
     /// Interrupt settings.
     ///
     /// A set bit indicates that the interrupt is enabled.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Interrupts : u32 {
         /// Word Start Interrupt Enable.
         const WORD_START = 1 << 12;
@@ -148,6 +149,7 @@ bitflags::bitflags! {
 
 bitflags::bitflags! {
     /// Status flags.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Status : u32 {
         /// Word Start Flag.
         ///

src/chip/drivers/trng.rs

@@ -333,7 +333,7 @@ impl rand_core::RngCore for RngCoreWrapper {
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), rand_core::Error> {
         // defer to Read implementation, converting error to rand_core's Error
         self.0.read(dest).map_err(|e| {
-            let code = e.0.bits | rand_core::Error::CUSTOM_START;
+            let code = e.0.bits() | rand_core::Error::CUSTOM_START;
             // Safety: Two highest bits always set.
             unsafe { core::num::NonZeroU32::new_unchecked(code).into() }
         })
@@ -347,7 +347,7 @@ pub struct Error(pub ErrorFlags);
 
 bitflags::bitflags! {
     /// Specific errors that may occur during entropy generation
-    #[cfg_attr(feature = "defmt", derive(defmt::Format))]
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct ErrorFlags : u32 {
         // STATUS register starts here (automatically set from bits)
         /// 1-bit run sampling 0s test failed
@@ -388,6 +388,13 @@ bitflags::bitflags! {
     }
 }
 
+#[cfg(feature = "defmt")]
+impl defmt::Format for ErrorFlags {
+    fn format(&self, f: defmt::Formatter) {
+        defmt::write!(f, "ErrorFlags({=u32:#x})", self.bits());
+    }
+}
+
 impl fmt::Display for Error {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "An error occurred in the TRNG module")

src/common/flexpwm.rs

@@ -89,6 +89,7 @@ bitflags::bitflags! {
     /// bits depends on the function.
     ///
     /// If you have an [`SM`], use [`SM::mask()`] to easily obtain its bitmask.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Mask : u8 {
         /// Submodule 0.
         const SM0 = 1 << 0;
@@ -676,6 +677,7 @@ impl LoadMode {
 
 bitflags::bitflags! {
     /// Status register flags.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Status : u16 {
         /// Registers updated flag.
         ///
@@ -718,6 +720,7 @@ impl Status {
 
 bitflags::bitflags! {
     /// Interrupt flags.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Interrupts : u16 {
         /// Reload error interrupt enable.
         const RELOAD_ERROR = 1 << 13;

src/common/lpi2c.rs

@@ -397,6 +397,7 @@ impl Drop for Disabled<'_> {
 
 bitflags::bitflags! {
     /// Status flags for the LPI2C controller.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct ControllerStatus : u32 {
         /// Bus busy flag.
         ///
@@ -488,6 +489,7 @@ bitflags::bitflags! {
     /// LPI2C interrupt settings.
     ///
     /// A set bit indicates that an interrupt is enabled.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Interrupts : u32 {
         /// Data match interrupt enable.
         const DATA_MATCH = 1 << 14;

src/common/lpspi.rs

@@ -1051,6 +1051,7 @@ impl Lpspi {
 
 bitflags::bitflags! {
     /// Status flags for the LPSPI interface.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Status : u32 {
         /// Module busy flag.
         ///
@@ -1160,6 +1161,7 @@ bitflags::bitflags! {
     ///
     /// A high bit indicates that the condition generates an interrupt.
     /// See the status bits for more information.
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
     pub struct Interrupts : u32 {
         /// Data match interrupt enable.
         const DATA_MATCH = 1 << 13;