From b295a62b183fc2fa7c0a1b23f91f91e3be160fd1 Mon Sep 17 00:00:00 2001 From: Philipp Oppermann Date: Fri, 14 May 2021 10:13:56 +0200 Subject: [PATCH] Update uefi crate to v0.9.0 --- Cargo.lock | 6 ++---- Cargo.toml | 2 +- src/bin/uefi.rs | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fffd05ba..5d03193b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "anyhow" version = "1.0.40" @@ -437,9 +435,9 @@ dependencies = [ [[package]] name = "uefi" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf8b4606744665c071d73d84b4ba9763b464f3500b73d8e2f13ef6f31c99f1be" +checksum = "e008be83f40df3c5ebf67bacdbc85ee41c2c1185d27ceb4e91f7a6744a0afc1d" dependencies = [ "bitflags", "log", diff --git a/Cargo.toml b/Cargo.toml index 91ef3119..e61b3174 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,7 +33,7 @@ x86_64 = { version = "0.13.2", optional = true, default-features = false, featur usize_conversions = { version = "0.2.0", optional = true } bit_field = { version = "0.10.0", optional = true } log = { version = "0.4.8", optional = true } -uefi = { version = "0.7.0", optional = true } +uefi = { version = "0.9.0", optional = true } argh = { version = "0.1.3", optional = true } displaydoc = { version = "0.1.7", optional = true } conquer-once = { version = "0.2.1", optional = true, default-features = false } diff --git a/src/bin/uefi.rs b/src/bin/uefi.rs index 916e28a5..c2ecc4a3 100644 --- a/src/bin/uefi.rs +++ b/src/bin/uefi.rs @@ -154,8 +154,8 @@ fn init_logger(st: &SystemTable) -> (PhysAddr, FrameBufferInfo) { horizontal_resolution: mode_info.resolution().0, vertical_resolution: mode_info.resolution().1, pixel_format: match mode_info.pixel_format() { - PixelFormat::RGB => bootloader::boot_info::PixelFormat::BGR, - PixelFormat::BGR => bootloader::boot_info::PixelFormat::BGR, + PixelFormat::Rgb => bootloader::boot_info::PixelFormat::BGR, + PixelFormat::Bgr => bootloader::boot_info::PixelFormat::BGR, PixelFormat::Bitmask | PixelFormat::BltOnly => { panic!("Bitmask and BltOnly framebuffers are not supported") }