diff --git a/Cargo.lock b/Cargo.lock index 91ac6193d7..f1db30d93c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2902,7 +2902,7 @@ dependencies = [ name = "xhcid" version = "0.1.0" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.11.0", "chashmap", "common", "crossbeam-channel", diff --git a/drivers/usb/xhcid/Cargo.toml b/drivers/usb/xhcid/Cargo.toml index 51eec59f36..f897dbae89 100644 --- a/drivers/usb/xhcid/Cargo.toml +++ b/drivers/usb/xhcid/Cargo.toml @@ -13,7 +13,7 @@ name = "xhcid_interface" path = "src/lib.rs" [dependencies] -bitflags = "1" +bitflags.workspace = true chashmap = "2.2.2" crossbeam-channel = "0.4" futures = "0.3" diff --git a/drivers/usb/xhcid/src/usb/hub.rs b/drivers/usb/xhcid/src/usb/hub.rs index fbdb860624..9dab55e85a 100644 --- a/drivers/usb/xhcid/src/usb/hub.rs +++ b/drivers/usb/xhcid/src/usb/hub.rs @@ -93,7 +93,7 @@ pub enum HubPortFeature { } bitflags::bitflags! { - #[derive(Default)] + #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)] #[repr(transparent)] pub struct HubPortStatusV2: u32 { const CONNECTION = 1 << 0; @@ -120,7 +120,7 @@ bitflags::bitflags! { unsafe impl plain::Plain for HubPortStatusV2 {} bitflags::bitflags! { - #[derive(Default)] + #[derive(Clone, Copy, Debug, Default, Eq, PartialEq)] #[repr(transparent)] pub struct HubPortStatusV3: u32 { const CONNECTION = 1 << 0; diff --git a/drivers/usb/xhcid/src/xhci/port.rs b/drivers/usb/xhcid/src/xhci/port.rs index 7c0f570d37..0654ccc3a7 100644 --- a/drivers/usb/xhcid/src/xhci/port.rs +++ b/drivers/usb/xhcid/src/xhci/port.rs @@ -9,6 +9,7 @@ use common::io::{Io, Mmio}; // Sticky register values may preserve values through chip hardware reset bitflags! { + #[derive(Debug)] pub struct PortFlags: u32 { const CCS = 1 << 0; // ROS const PED = 1 << 1; // RW1CS