Skip to content

Commit b7c1012

Browse files
authored
Merge branch 'master' into try
2 parents 2dfeb8a + b706c76 commit b7c1012

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ repository = "https://github.com/rust-osdev/uart_16550"
88
edition = "2018"
99

1010
[dependencies]
11-
bitflags = "1.1.0"
11+
bitflags = "2"
1212
rustversion = "1.0.5"
1313

1414
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Unreleased
22

33
- Add `try_send_raw` and `try_receive` ([#34](https://github.com/rust-osdev/uart_16550/pull/34))
4+
- Update bitflags dependency to version 2 ([#33](https://github.com/rust-osdev/uart_16550/pull/33))
45

56
# 0.3.0 – 2023-08-04
67

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ pub use crate::port::SerialPort;
8989

9090
bitflags! {
9191
/// Interrupt enable flags
92+
#[repr(transparent)]
93+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
9294
struct IntEnFlags: u8 {
9395
const RECEIVED = 1;
9496
const SENT = 1 << 1;
@@ -100,6 +102,8 @@ bitflags! {
100102

101103
bitflags! {
102104
/// Line status flags
105+
#[repr(transparent)]
106+
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
103107
struct LineStsFlags: u8 {
104108
const INPUT_FULL = 1;
105109
// 1 to 4 unknown

0 commit comments

Comments
 (0)