Merge branch 'bitflags' into 'main'

add bitflags to the workspace Cargo.toml

See merge request redox-os/base!182

Cargo.lock

@@ -6,7 +6,6 @@ version = 4
 name = "ac97d"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.3.2",
  "common",
  "daemon",
  "libredox",
@@ -59,7 +58,6 @@ dependencies = [
 name = "ahcid"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.3.2",
  "byteorder",
  "common",
  "daemon",
@@ -1585,7 +1583,7 @@ dependencies = [
 name = "ps2d"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.11.0",
  "common",
  "daemon",
  "inputd",
@@ -2904,7 +2902,7 @@ dependencies = [
 name = "xhcid"
 version = "0.1.0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.11.0",
  "chashmap",
  "common",
  "crossbeam-channel",

Cargo.toml

@@ -74,6 +74,7 @@ exclude = ["bootstrap"]
 # Remember to also update bootstrap dependencies, those are not in the workspace
 [workspace.dependencies]
 anyhow = "1"
+bitflags = "2"
 drm = "0.14.2"
 drm-sys = "0.8.1"
 libc = "0.2.181"

drivers/audio/ac97d/Cargo.toml

@@ -5,7 +5,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "1"
 common = { path = "../../common" }
 libredox.workspace = true
 log.workspace = true

drivers/audio/ac97d/src/main.rs

@@ -1,6 +1,5 @@
 //#![deny(warnings)]
 
-extern crate bitflags;
 extern crate event;
 extern crate spin;
 extern crate syscall;

drivers/audio/ihdad/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 libredox.workspace = true
 log.workspace = true
 redox_event.workspace = true

drivers/audio/sb16d/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 common = { path = "../../common" }
 libredox.workspace = true
 log.workspace = true

drivers/input/ps2d/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-bitflags = "1"
+bitflags.workspace = true
 log.workspace = true
 orbclient.workspace = true
 redox_event.workspace = true

drivers/input/ps2d/src/controller.rs

@@ -45,6 +45,7 @@ bitflags! {
 }
 
 bitflags! {
+    #[derive(Clone, Copy, Debug)]
     pub struct ConfigFlags: u8 {
         const FIRST_INTERRUPT = 1 << 0;
         const SECOND_INTERRUPT = 1 << 1;

drivers/input/usbhidd/Cargo.toml

@@ -10,7 +10,7 @@ license = "MIT"
 
 [dependencies]
 anyhow.workspace = true
-bitflags = "2"
+bitflags.workspace = true
 log.workspace = true
 orbclient.workspace = true
 redox_syscall.workspace = true

drivers/net/e1000d/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 log.workspace = true
 libredox.workspace = true
 redox_event.workspace = true

drivers/net/ixgbed/Cargo.toml

@@ -5,7 +5,7 @@ version = "1.0.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 libredox.workspace = true
 redox_event.workspace = true
 redox_syscall.workspace = true

drivers/net/rtl8139d/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 libredox.workspace = true
 log.workspace = true
 redox_event.workspace = true

drivers/net/rtl8168d/Cargo.toml

@@ -5,7 +5,7 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-bitflags = "2"
+bitflags.workspace = true
 libredox.workspace = true
 log.workspace = true
 redox_event.workspace = true

drivers/storage/ahcid/Cargo.toml

@@ -5,7 +5,6 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-bitflags = "1.2"
 byteorder = "1.2"
 log.workspace = true
 redox_syscall = { workspace = true, features = ["std"] }

drivers/storage/nvmed/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 
 [dependencies]
 arrayvec = "0.7"
-bitflags = "2"
+bitflags.workspace = true
 futures = "0.3"
 libredox.workspace = true
 log.workspace = true

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"

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;

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

drivers/virtio-core/Cargo.toml

@@ -7,7 +7,7 @@ authors = ["Anhad Singh <andypython@protonmail.com>"]
 
 [dependencies]
 static_assertions = "1.1.0"
-bitflags = "2.3.2"
+bitflags.workspace = true
 redox_syscall.workspace = true
 libredox.workspace = true
 log.workspace = true