Update redox_uefi_std

Signed-off-by: Tim Crawford <tcrawford@system76.com>

Cargo.toml

@@ -15,7 +15,7 @@ plain = "0.2.3"
 redox_dmi = "0.1.6"
 redox_hwio = { version = "0.1.6", default-features = false }
 redox_intelflash = "0.1.3"
-redox_uefi_std = "0.1.12"
+redox_uefi_std = { git = "https://gitlab.redox-os.org/redox-os/uefi.git" }
 system76_ecflash = "0.1.3"
 
 [dependencies.system76_ectool]

src/app/bios.rs

@@ -4,15 +4,14 @@ use alloc::collections::BTreeMap;
 use alloc::string::String;
 use core::arch::asm;
 use core::char;
+use core::ptr;
 use coreboot_fs::Rom;
 use ecflash::EcFlash;
 use intel_spi::{HsfStsCtl, Spi, SpiDev};
 use plain::Plain;
 use std::fs::{find, load};
 use std::prelude::*;
-use std::ptr;
 use std::uefi::reset::ResetType;
-use std::uefi::status::{Error, Result, Status};
 use std::vars::{get_boot_item, get_boot_order, set_boot_item, set_boot_order};
 
 use super::{
@@ -224,7 +223,7 @@ impl Component for BiosComponent {
             //     Self::spi_unlock();
             // }
 
-            let len = spi.len().map_err(|_| Error::DeviceError)?;
+            let len = spi.len().map_err(|_| Status::DEVICE_ERROR)?;
             Ok(data.len() == len)
         } else if self.capsule {
             Ok(true)
@@ -290,11 +289,11 @@ impl Component for BiosComponent {
             }
 
             // Check ROM size
-            let len = spi.len().map_err(|_| Error::DeviceError)?;
+            let len = spi.len().map_err(|_| Status::DEVICE_ERROR)?;
             println!("SPI ROM: {} MB", len / (1024 * 1024));
             if len != new.len() {
                 println!("firmware.rom size invalid");
-                return Err(Error::DeviceError);
+                return Err(Status::DEVICE_ERROR);
             }
 
             // Read current data
@@ -306,7 +305,7 @@ impl Component for BiosComponent {
                     let mut buf = [0; 4096];
                     let read = spi
                         .read(data.len(), &mut buf)
-                        .map_err(|_| Error::DeviceError)?;
+                        .map_err(|_| Status::DEVICE_ERROR)?;
                     data.extend_from_slice(&buf[..read]);
 
                     // Print output once per megabyte
@@ -325,7 +324,7 @@ impl Component for BiosComponent {
                 Ok(false) => (),
                 Err(err) => {
                     println!("Ethernet: failed to copy: {}", err);
-                    return Err(Error::DeviceError);
+                    return Err(Status::DEVICE_ERROR);
                 }
             }
 
@@ -376,7 +375,7 @@ impl Component for BiosComponent {
                     );
                     let new_slice = new
                         .get_mut(new_offset..new_offset + new_size)
-                        .ok_or(Error::DeviceError)?;
+                        .ok_or(Status::DEVICE_ERROR)?;
 
                     if let Some(area) = areas.get(area_name) {
                         let offset = area.offset as usize;
@@ -387,7 +386,7 @@ impl Component for BiosComponent {
                             new_offset,
                             new_size / 1024
                         );
-                        let slice = data.get(offset..offset + size).ok_or(Error::DeviceError)?;
+                        let slice = data.get(offset..offset + size).ok_or(Status::DEVICE_ERROR)?;
 
                         if slice.len() == new_slice.len() {
                             new_slice.copy_from_slice(slice);
@@ -471,7 +470,7 @@ impl Component for BiosComponent {
                                 "\nverification failed as {:#x}: {:#x} != {:#x}",
                                 address, data[address], new[address]
                             );
-                            return Err(Error::DeviceError);
+                            return Err(Status::DEVICE_ERROR);
                         }
                         address += 1;
                     }
@@ -547,7 +546,7 @@ impl Component for BiosComponent {
 
             if status != 0 {
                 println!("{} Flash Error: {}", self.name(), status);
-                return Err(Error::DeviceError);
+                return Err(Status::DEVICE_ERROR);
             }
         }
 

src/app/component.rs

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use std::uefi::status::Result;
+use std::prelude::*;
 
 pub trait Component {
     fn name(&self) -> &str;

src/app/ec.rs

@@ -1,21 +1,19 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use core::ops::{ControlFlow, Try};
 use ecflash::{Ec, EcFile, EcFlash};
 use ectool::{timeout, Access, AccessLpcDirect, Firmware, SecurityState, Spi, SpiRom, SpiTarget, Timeout};
 use plain::Plain;
 use std::prelude::*;
 use std::uefi::{
     self,
     reset::ResetType,
-    status::{Error, Result, Status},
 };
+use core::cell::Cell;
+use core::ptr;
+use core::str;
 use std::{
-    cell::Cell,
     ffi::wstr,
     fs::{find, load},
-    ptr,
-    str,
 };
 
 use super::{pci_read, shell, Component, EC2ROM, ECROM, ECTAG, FIRMWAREDIR, FIRMWARENSH};
@@ -741,7 +739,7 @@ impl Component for EcComponent {
                     Ok(())
                 } else {
                     println!("{} Flash Error: {}", self.name(), status);
-                    Err(Error::DeviceError)
+                    Err(Status::DEVICE_ERROR)
                 }
             },
             EcKind::System76(_ec, _pmc) => {
@@ -753,7 +751,7 @@ impl Component for EcComponent {
                     Ok(()) => Ok(()),
                     Err(err) => {
                         println!("{} Flash Error: {:X?}", self.name(), err);
-                        Err(Error::DeviceError)
+                        Err(Status::DEVICE_ERROR)
                     }
                 }
             }
@@ -765,13 +763,13 @@ impl Component for EcComponent {
                     Ok(()) => Ok(()),
                     Err(err) => {
                         println!("{} Flash Error: {:X?}", self.name(), err);
-                        Err(Error::DeviceError)
+                        Err(Status::DEVICE_ERROR)
                     }
                 }
             }
             EcKind::Unknown => {
                 println!("{} Failed to flash EcKind::Unknown", self.name());
-                Err(Error::DeviceError)
+                Err(Status::DEVICE_ERROR)
             }
         };
 
@@ -780,7 +778,7 @@ impl Component for EcComponent {
                 Ok((_, firmware_dir)) => {
                     //Try to create tag file without running shell
                     let filename = wstr(ECTAG);
-                    let mut file = std::ptr::null_mut::<uefi::fs::File>();
+                    let mut file = ptr::null_mut::<uefi::fs::File>();
                     match (firmware_dir.0.Open)(
                         firmware_dir.0,
                         &mut file,
@@ -790,16 +788,15 @@ impl Component for EcComponent {
                             | uefi::fs::FILE_MODE_WRITE,
                         0,
                     )
-                    .branch()
                     {
-                        ControlFlow::Continue(_) => {
+                        Status::SUCCESS => {
                             unsafe {
                                 let _ = ((*file).Close)(&mut *file);
                             }
                             println!("EC tag: created successfully");
                         }
-                        ControlFlow::Break(err) => {
-                            println!("EC tag: failed to create {}: {:?}", ECTAG, err);
+                        err => {
+                            println!("EC tag: failed to create {}: {}", ECTAG, err);
                         }
                     }
                 }
@@ -832,9 +829,9 @@ fn memory_kind() -> Result<u8> {
         if let Ok(info) = dmi::MemoryDevice::from_bytes(&table.data) {
             return Ok(info.memory_kind);
         } else {
-            return Err(Error::DeviceError);
+            return Err(Status::DEVICE_ERROR);
         }
     }
 
-    Err(Error::DeviceError)
+    Err(Status::DEVICE_ERROR)
 }

src/app/mod.rs

@@ -1,7 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
-use core::ops::{ControlFlow, Try};
-use core::prelude::v1::derive;
 use core::{char, mem, ptr};
 use orbclient::{Color, Renderer};
 use std::exec::exec_path;
@@ -11,7 +9,6 @@ use std::prelude::*;
 use std::proto::Protocol;
 use std::uefi::guid;
 use std::uefi::reset::ResetType;
-use std::uefi::status::{Error, Result, Status};
 use std::vars::{
     get_boot_current, get_boot_item, get_boot_next, get_boot_order,
     set_boot_item, set_boot_next, set_boot_order,
@@ -64,7 +61,7 @@ enum ValidateKind {
     Found,
     Mismatch,
     NotFound,
-    Error(Error),
+    Error(Status),
 }
 
 fn components_validations() -> (Vec<Box<dyn Component>>, Vec<ValidateKind>) {
@@ -90,7 +87,7 @@ fn components_validations() -> (Vec<Box<dyn Component>>, Vec<ValidateKind>) {
                     }
                 }
                 Err(err) => {
-                    if err == Error::NotFound || err == Error::InvalidParameter {
+                    if err == Status::NOT_FOUND || err == Status::INVALID_PARAMETER {
                         ValidateKind::NotFound
                     } else {
                         ValidateKind::Error(err)
@@ -134,10 +131,10 @@ fn reset_dmi() -> Result<()> {
         let mut size = 1024;
         let status =
             (uefi.RuntimeServices.GetNextVariableName)(&mut size, name.as_mut_ptr(), &mut guid);
-        if let ControlFlow::Break(err) = status.branch() {
-            match err {
-                Error::NotFound => break,
-                _ => return Err(err),
+        if !status.is_success() {
+            match status {
+                Status::NOT_FOUND => break,
+                _ => return Err(status),
             }
         }
         let name_str = nstr(name.as_mut_ptr());
@@ -153,16 +150,16 @@ fn reset_dmi() -> Result<()> {
         let mut attributes = 0;
         let mut data = [0; 65536];
         let mut data_size = data.len();
-        (uefi.RuntimeServices.GetVariable)(
+        Result::from((uefi.RuntimeServices.GetVariable)(
             wname.as_ptr(),
             &guid,
             &mut attributes,
             &mut data_size,
             data.as_mut_ptr(),
-        )?;
+        ))?;
 
         let empty = [];
-        (uefi.RuntimeServices.SetVariable)(wname.as_ptr(), &guid, attributes, 0, empty.as_ptr())?;
+        Result::from((uefi.RuntimeServices.SetVariable)(wname.as_ptr(), &guid, attributes, 0, empty.as_ptr()))?;
     }
 
     Ok(())
@@ -227,15 +224,15 @@ fn inner() -> Result<()> {
     } else {
         let c = if let Ok((_, ectag)) = find(ECTAG) {
             // Attempt to remove EC tag
-            match (ectag.0.Delete)(ectag.0).branch() {
-                ControlFlow::Continue(_) => {
+            match (ectag.0.Delete)(ectag.0) {
+                Status::SUCCESS => {
                     println!("EC tag: deleted successfully");
 
                     // Have to prevent Close from being called after Delete
                     mem::forget(ectag);
                 }
-                ControlFlow::Break(err) => {
-                    println!("EC tag: failed to delete: {:?}", err);
+                err => {
+                    println!("EC tag: failed to delete: {}", err);
                 }
             }
 
@@ -279,7 +276,7 @@ fn inner() -> Result<()> {
                             Ok(()) => (),
                             Err(err) => {
                                 println!("Failed to unlock firmware: {:?}", err);
-                                return Err(Error::DeviceError);
+                                return Err(Status::DEVICE_ERROR);
                             }
                         },
                         // Assume EC is unlocked if not running System76 EC
@@ -372,7 +369,7 @@ pub fn main() -> Result<()> {
         for i in 0..output.0.Mode.MaxMode {
             let mut mode_ptr = ::core::ptr::null_mut();
             let mut mode_size = 0;
-            (output.0.QueryMode)(output.0, i, &mut mode_size, &mut mode_ptr)?;
+            Result::from((output.0.QueryMode)(output.0, i, &mut mode_size, &mut mode_ptr))?;
 
             let mode = unsafe { &mut *mode_ptr };
             let w = mode.HorizontalResolution;