Hacks

Author: veluca93

pixie-uefi/src/os/mod.rs

@@ -76,7 +76,6 @@ struct UefiOSImpl {
     tasks: Vec<Arc<Task>>,
     input: ScopedProtocol<Input>,
     vga: ScopedProtocol<Output>,
-    serial: ScopedProtocol<Serial>,
     net: Option<NetworkInterface>,
     messages: VecDeque<(f64, log::Level, String, String)>,
     ui_buf: Vec<(String, Color, Color)>,
@@ -183,9 +182,6 @@ impl UefiOS {
         let input_handles = uefi::boot::find_handles::<Input>().unwrap();
         let input = uefi::boot::open_protocol_exclusive::<Input>(input_handles[0]).unwrap();
 
-        let serial_handles = uefi::boot::find_handles::<Serial>().unwrap();
-        let serial = uefi::boot::open_protocol_exclusive::<Serial>(serial_handles[0]).unwrap();
-
         let vga_handles = uefi::boot::find_handles::<Output>().unwrap();
         let mut vga = uefi::boot::open_protocol_exclusive::<Output>(vga_handles[0]).unwrap();
 
@@ -197,7 +193,6 @@ impl UefiOS {
             tasks: Vec::new(),
             input,
             vga,
-            serial,
             net: None,
             messages: VecDeque::new(),
             ui_buf: vec![],
@@ -394,31 +389,6 @@ impl UefiOS {
             .to_string()
     }
 
-    /// Find the topmost device that implements this protocol.
-    fn handle_on_device<P: Protocol>(&self, device: &DevicePath) -> Handle {
-        for i in 0..device.node_iter().count() {
-            let mut buf = vec![];
-            let mut dev = DevicePathBuilder::with_vec(&mut buf);
-            for node in device.node_iter().take(i + 1) {
-                dev = dev.push(&node).unwrap();
-            }
-            let mut dev = dev.finalize().unwrap();
-            if let Ok(h) = uefi::boot::locate_device_path::<P>(&mut dev) {
-                return h;
-            }
-        }
-        // TODO(veluca): bubble up errors.
-        panic!("handle not found");
-    }
-
-    fn open_protocol_on_device<P: Protocol>(
-        &self,
-        device: &DevicePath,
-    ) -> Result<ScopedProtocol<P>> {
-        let handle = self.handle_on_device::<P>(device);
-        Ok(uefi::boot::open_protocol_exclusive::<P>(handle)?)
-    }
-
     pub fn open_first_disk(&self) -> Disk {
         Disk::new(*self)
     }
@@ -542,19 +512,6 @@ impl UefiOS {
         {
             let mut os = self.borrow_mut();
 
-            let style = match level {
-                log::Level::Trace => anstyle::AnsiColor::Cyan.on_default(),
-                log::Level::Debug => anstyle::AnsiColor::Blue.on_default(),
-                log::Level::Info => anstyle::AnsiColor::Green.on_default(),
-                log::Level::Warn => anstyle::AnsiColor::Yellow.on_default(),
-                log::Level::Error => anstyle::AnsiColor::Red.on_default().bold(),
-            };
-            write!(
-                os.serial,
-                "[{time:.1}s {style}{level:5}{style:#} {target}] {msg}\r\n"
-            )
-            .unwrap();
-
             os.messages.push_back((time, level, target.into(), msg));
             const MAX_MESSAGES: usize = 5;
             if os.messages.len() > MAX_MESSAGES {

pixie-uefi/src/os/net.rs

@@ -158,17 +158,9 @@ pub struct NetworkInterface {
 
 impl NetworkInterface {
     pub fn new(os: UefiOS) -> NetworkInterface {
-        let bo = os.boot_options();
-        let curopt = bo.get(bo.current());
-        let (descr, device) = bo.boot_entry_info(&curopt[..]);
-        log::info!(
-            "Configuring network on interface used for booting ({} -- {})",
-            descr,
-            os.device_path_to_string(device)
-        );
-        let mut device = SnpDevice::new(Box::leak(Box::new(
-            os.open_protocol_on_device::<SimpleNetwork>(device).unwrap(),
-        )));
+        let snp_handles = uefi::boot::find_handles::<SimpleNetwork>().unwrap();
+        let snp = uefi::boot::open_protocol_exclusive::<SimpleNetwork>(snp_handles[0]).unwrap();
+        let mut device = SnpDevice::new(Box::leak(Box::new(snp)));
 
         let hw_addr = HardwareAddress::Ethernet(smoltcp::wire::EthernetAddress::from_bytes(
             &device.snp.mode().current_address.0[..6],