Merge branch 'master' into try

rust-osdev · Jul 10, 2024 · b7c1012 · b7c1012
2 parents 2dfeb8a + b706c76
commit b7c1012
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/rust-osdev/uart_16550"
 edition = "2018"
 
 [dependencies]
-bitflags = "1.1.0"
+bitflags = "2"
 rustversion = "1.0.5"
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]

diff --git a/Changelog.md b/Changelog.md
@@ -1,6 +1,7 @@
 # Unreleased
 
 - Add `try_send_raw` and `try_receive` ([#34](https://github.com/rust-osdev/uart_16550/pull/34))
+- Update bitflags dependency to version 2 ([#33](https://github.com/rust-osdev/uart_16550/pull/33))
 
 # 0.3.0 – 2023-08-04
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -89,6 +89,8 @@ pub use crate::port::SerialPort;
 
 bitflags! {
     /// Interrupt enable flags
+    #[repr(transparent)]
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
     struct IntEnFlags: u8 {
         const RECEIVED = 1;
         const SENT = 1 << 1;
@@ -100,6 +102,8 @@ bitflags! {
 
 bitflags! {
     /// Line status flags
+    #[repr(transparent)]
+    #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
     struct LineStsFlags: u8 {
         const INPUT_FULL = 1;
         // 1 to 4 unknown