More logging improvements

Cargo.lock

@@ -179,6 +179,7 @@ dependencies = [
  "common",
  "inputd",
  "libredox",
+ "log",
  "orbclient",
  "pcid",
  "redox-daemon",
@@ -408,6 +409,7 @@ dependencies = [
  "common",
  "driver-network",
  "libredox",
+ "log",
  "pcid",
  "redox-daemon",
  "redox_event",

graphics/bgad/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2021"
 
 [dependencies]
 orbclient = "0.3.47"
+log = "0.4"
 redox-daemon = "0.1"
 redox-scheme = "0.6.2"
 redox_syscall = "0.5"

graphics/bgad/src/main.rs

@@ -16,7 +16,15 @@ fn main() {
     let mut name = pci_config.func.name();
     name.push_str("_bga");
 
-    println!(" + BGA {}", pci_config.func.display());
+    common::setup_logging(
+        "graphics",
+        "pci",
+        &name,
+        log::LevelFilter::Warn,
+        log::LevelFilter::Info,
+    );
+
+    log::info!(" + BGA {}", pci_config.func.display());
 
     redox_daemon::Daemon::new(move |daemon| {
         acquire_port_io_rights().expect("bgad: failed to get port IO permission");
@@ -24,7 +32,7 @@ fn main() {
         let socket = Socket::create("bga").expect("bgad: failed to create bga scheme");
 
         let mut bga = Bga::new();
-        println!("   - BGA {}x{}", bga.width(), bga.height());
+        log::info!("   - BGA {}x{}", bga.width(), bga.height());
 
         let mut scheme = BgaScheme {
             bga,

graphics/virtio-gpud/src/main.rs

@@ -550,7 +550,7 @@ fn daemon_runner(redox_daemon: redox_daemon::Daemon) -> ! {
 
 pub fn main() {
     common::setup_logging(
-        "misc",
+        "graphics",
         "pci",
         "virtio-gpud",
         log::LevelFilter::Warn,

input/ps2d/src/main.rs

@@ -27,7 +27,7 @@ mod vm;
 
 fn daemon(daemon: redox_daemon::Daemon) -> ! {
     common::setup_logging(
-        "misc",
+        "input",
         "ps2",
         "ps2",
         log::LevelFilter::Warn,

inputd/src/main.rs

@@ -573,7 +573,7 @@ fn daemon_runner(redox_daemon: redox_daemon::Daemon) -> ! {
 
 fn main() {
     common::setup_logging(
-        "misc",
+        "input",
         "inputd",
         "inputd",
         log::LevelFilter::Warn,

net/e1000d/Cargo.toml

@@ -5,6 +5,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = "2"
+log = "0.4"
 redox-daemon = "0.1.2"
 libredox = "0.1.3"
 redox_event = "0.4.1"

net/e1000d/src/device.rs

@@ -259,7 +259,7 @@ impl Intel8254x {
     pub unsafe fn init(&mut self) {
         self.flag(CTRL, CTRL_RST, true);
         while self.read_reg(CTRL) & CTRL_RST == CTRL_RST {
-            print!("   - Waiting for reset: {:X}\n", self.read_reg(CTRL));
+            log::trace!("Waiting for reset: {:X}", self.read_reg(CTRL));
         }
 
         // Enable auto negotiate, link, clear reset, do not Invert Loss-Of Signal
@@ -287,12 +287,9 @@ impl Intel8254x {
             mac_high as u8,
             (mac_high >> 8) as u8,
         ];
-        print!(
-            "{}",
-            format!(
-                "   - MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}\n",
-                mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]
-            )
+        log::info!(
+            "MAC: {:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}:{:>02X}",
+            mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]
         );
         self.mac_address = mac;
 
@@ -350,12 +347,12 @@ impl Intel8254x {
         // TIPG Packet Gap
         // TODO ...
 
-        print!("   - Waiting for link up: {:X}\n", self.read_reg(STATUS));
+        log::debug!("Waiting for link up: {:X}", self.read_reg(STATUS));
         while self.read_reg(STATUS) & 2 != 2 {
             thread::sleep(time::Duration::from_millis(100));
         }
-        print!(
-            "   - Link is up with speed {}\n",
+        log::info!(
+            "Link is up with speed {}",
             match (self.read_reg(STATUS) >> 6) & 0b11 {
                 0b00 => "10 Mb/s",
                 0b01 => "100 Mb/s",

net/e1000d/src/main.rs

@@ -14,12 +14,20 @@ fn main() {
     let mut name = pci_config.func.name();
     name.push_str("_e1000");
 
+    common::setup_logging(
+        "net",
+        "pci",
+        &name,
+        log::LevelFilter::Warn,
+        log::LevelFilter::Info,
+    );
+
     let irq = pci_config
         .func
         .legacy_interrupt_line
         .expect("e1000d: no legacy interrupts supported");
 
-    eprintln!(" + E1000 {}", pci_config.func.display());
+    log::info!(" + E1000 {}", pci_config.func.display());
 
     redox_daemon::Daemon::new(move |daemon| {
         let mut irq_file = irq.irq_handle("e1000d");