Use public version of efiloader from crates.iomain

3 files changed, 6 insertions, 13 deletions

diff --git a/Cargo.lock b/Cargo.lock
index 840486a..71bab1c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -44,15 +44,14 @@ checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484"
 [[package]]
 name = "efiloader"
 version = "0.0.1"
-source = "git+https://github.com/ardbiesheuvel/efiloader#6f97bcf558b8fabe8706cbd874138a99df1e8153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "949569f74d45413c028526020833a62a7f3a672c90238c561507cdc61a18dd53"
 dependencies = [
  "const-utf16",
  "crc",
  "linked_list_allocator",
  "log",
- "mmio",
  "once_cell",
- "spinning_top",
  "widestring",
 ]
 
@@ -111,12 +110,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
-name = "mmio"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee857bfd0b37394f3507d78ee7bd4b712a2179a2ce50e47d36bbb481672f5408"
-
-[[package]]
 name = "numtoa"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/Cargo.toml b/Cargo.toml
index 470906c..cf5fa84 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
-efiloader = { git = "https://github.com/ardbiesheuvel/efiloader", default-features = false }
+efiloader = { version = "0.0.1", default-features = false }
 libc = "*"
 log = "*"
 rand = "*"
diff --git a/src/main.rs b/src/main.rs
index 1a6ef20..62d8493 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,7 +19,7 @@ use efiloader::devicepath::DevicePathType::*;
 use efiloader::devicepath::DevicePathSubtype::*;
 
 use efiloader::status::Status;
-use efiloader::DumbConsole;
+use efiloader::SimpleConsole;
 use efiloader::blockio::*;
 
 struct DumbSerialConsole {
@@ -28,7 +28,7 @@ struct DumbSerialConsole {
 
 static mut CON: DumbSerialConsole = DumbSerialConsole { term: None };
 impl DumbSerialConsole {
-    fn new() -> Option<&'static (dyn DumbConsole + Send + Sync)> {
+    fn new() -> Option<&'static (dyn SimpleConsole)> {
         unsafe {
             CON.term = Some(io::stdout().into_raw_mode().ok()?);
             Some(&CON)
@@ -36,7 +36,7 @@ impl DumbSerialConsole {
     }
 }
 
-impl efiloader::DumbConsole for DumbSerialConsole {
+impl efiloader::SimpleConsole for DumbSerialConsole {
     fn write_string(&self, s: &str) {
         for c in s.chars() {
             let s = &[c as u8];