Skip to content
Snippets Groups Projects
Commit c4e47bcc authored by Martin Kröning's avatar Martin Kröning :crab:
Browse files

Upgrade to bitflags 2.0

parent 5aa798f7
No related branches found
No related tags found
No related merge requests found
......@@ -76,6 +76,12 @@ version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4f6e5df9abedba5099a01a6567c6086a6fbcff57af07c360d356737f9e0c644"
[[package]]
name = "byteorder"
version = "1.4.3"
......@@ -124,7 +130,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3a0ae7494d9bff013d7b89471f4c424356a71e9752e0c78abe7e6c608a16bb3"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"defmt-macros",
]
......@@ -332,7 +338,7 @@ dependencies = [
"ahash",
"align-address",
"async-task",
"bitflags",
"bitflags 2.0.0",
"crossbeam-utils",
"dyn-clone",
"float-cmp",
......@@ -610,7 +616,7 @@ version = "10.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c307f7aacdbab3f0adee67d52739a1d71112cc068d6fab169ddeb18e48877fad"
dependencies = [
"bitflags",
"bitflags 1.3.2",
]
[[package]]
......@@ -619,7 +625,7 @@ version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
dependencies = [
"bitflags",
"bitflags 1.3.2",
]
[[package]]
......@@ -637,7 +643,7 @@ version = "0.36.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"errno",
"io-lifetimes",
"libc",
......@@ -701,7 +707,7 @@ version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e9786ac45091b96f946693e05bfa4d8ca93e2d3341237d97a380107a6b38dea"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"byteorder",
"cfg-if",
"defmt",
......@@ -781,7 +787,7 @@ version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b074eb9300ad949edd74c529c0e8d451625af71bb948e6b65fe69f72dc1363d9"
dependencies = [
"bitflags",
"bitflags 1.3.2",
"rustversion",
"x86_64",
]
......@@ -914,7 +920,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2781db97787217ad2a2845c396a5efe286f87467a5810836db6d74926e94a385"
dependencies = [
"bit_field",
"bitflags",
"bitflags 1.3.2",
"raw-cpuid",
]
......@@ -925,7 +931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "100555a863c0092238c2e0e814c1096c1e5cf066a309c696a87e907b5f8c5d69"
dependencies = [
"bit_field",
"bitflags",
"bitflags 1.3.2",
"rustversion",
"volatile",
]
......
......@@ -70,7 +70,7 @@ dhcpv4 = [
[dependencies]
ahash = { version = "0.8", default-features = false }
align-address = "0.1"
bitflags = "1.3"
bitflags = "2.0"
crossbeam-utils = { version = "0.8", default-features = false }
dyn-clone = "1.0"
hashbrown = { version = "0.13", default-features = false }
......
......@@ -30,6 +30,7 @@ bitflags! {
/// Useful flags for an entry in either table (L0Table, L1Table, L2Table, L3Table).
///
/// See ARM Architecture Reference Manual, ARMv8, for ARMv8-A Reference Profile, Issue C.a, Chapter D4.3.3
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
pub struct PageTableEntryFlags: u64 {
/// Set if this entry is valid.
const PRESENT = 1 << 0;
......@@ -75,7 +76,7 @@ bitflags! {
impl PageTableEntryFlags {
/// An empty set of flags for unused/zeroed table entries.
/// Needed as long as empty() is no const function.
const BLANK: PageTableEntryFlags = PageTableEntryFlags { bits: 0 };
const BLANK: PageTableEntryFlags = PageTableEntryFlags::empty();
pub fn device(&mut self) -> &mut Self {
self.insert(PageTableEntryFlags::DEVICE_NGNRE);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment