diff --git a/audio/ac97d/src/main.rs b/audio/ac97d/src/main.rs index 92bd69db41..3249fb2e1e 100644 --- a/audio/ac97d/src/main.rs +++ b/audio/ac97d/src/main.rs @@ -38,8 +38,8 @@ fn main() { redox_daemon::Daemon::new(move |daemon| { common::setup_logging( "audio", - "pcie", - "ac97", + "pci", + &name, log::LevelFilter::Info, log::LevelFilter::Info, ); diff --git a/audio/ihdad/src/hda/cmdbuff.rs b/audio/ihdad/src/hda/cmdbuff.rs index 88c08b5eea..6ada5f43c8 100644 --- a/audio/ihdad/src/hda/cmdbuff.rs +++ b/audio/ihdad/src/hda/cmdbuff.rs @@ -74,7 +74,6 @@ struct Corb { impl Corb { pub fn new(regs_addr: usize, corb_buff_phys: usize, corb_buff_virt: *mut u32) -> Corb { - println!("regs addr {:x}", regs_addr); unsafe { Corb { regs: &mut *(regs_addr as *mut CorbRegs), @@ -84,11 +83,10 @@ impl Corb { } } } + //Intel 4.4.1.3 pub fn init(&mut self) { - println!("{}:{}", file!(), line!()); self.stop(); - println!("{}:{}", file!(), line!()); //Determine CORB and RIRB size and allocate buffer //3.3.24 diff --git a/audio/ihdad/src/main.rs b/audio/ihdad/src/main.rs index 078b12265d..fefaf2f0ad 100755 --- a/audio/ihdad/src/main.rs +++ b/audio/ihdad/src/main.rs @@ -59,14 +59,6 @@ fn get_int_method(pcid_handle: &mut PciFunctionHandle) -> File { } fn daemon(daemon: redox_daemon::Daemon) -> ! { - common::setup_logging( - "audio", - "pcie", - "ihda", - log::LevelFilter::Info, - log::LevelFilter::Info, - ); - let mut pcid_handle = PciFunctionHandle::connect_default(); let pci_config = pcid_handle.config(); @@ -74,6 +66,14 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { let mut name = pci_config.func.name(); name.push_str("_ihda"); + common::setup_logging( + "audio", + "pci", + &name, + log::LevelFilter::Info, + log::LevelFilter::Info, + ); + log::info!(" + IHDA {}", pci_config.func.display()); let address = unsafe { pcid_handle.map_bar(0) }.ptr.as_ptr() as usize; diff --git a/audio/sb16d/src/main.rs b/audio/sb16d/src/main.rs index dfa863a7e1..352313dbda 100644 --- a/audio/sb16d/src/main.rs +++ b/audio/sb16d/src/main.rs @@ -21,7 +21,7 @@ fn main() { redox_daemon::Daemon::new(move |daemon| { common::setup_logging( "audio", - "pcie", + "pci", "sb16", log::LevelFilter::Info, log::LevelFilter::Info, diff --git a/graphics/virtio-gpud/src/main.rs b/graphics/virtio-gpud/src/main.rs index 4b9654fe17..0c000f53ae 100644 --- a/graphics/virtio-gpud/src/main.rs +++ b/graphics/virtio-gpud/src/main.rs @@ -551,7 +551,7 @@ fn daemon_runner(redox_daemon: redox_daemon::Daemon) -> ! { pub fn main() { common::setup_logging( "misc", - "pcie", + "pci", "virtio-gpud", log::LevelFilter::Trace, log::LevelFilter::Trace, diff --git a/input/usbhidd/src/main.rs b/input/usbhidd/src/main.rs index 6bc79da3aa..4cef9c7c6e 100644 --- a/input/usbhidd/src/main.rs +++ b/input/usbhidd/src/main.rs @@ -167,14 +167,6 @@ fn send_key_event( } fn main() { - common::setup_logging( - "usb", - "device", - "hid", - log::LevelFilter::Info, - log::LevelFilter::Info, - ); - let mut args = env::args().skip(1); const USAGE: &'static str = "usbhidd "; @@ -190,6 +182,15 @@ fn main() { .expect(USAGE) .parse::() .expect("Expected integer as input of interface"); + + let name = format!("{}_{}_{}_hid", scheme, port, interface_num); + common::setup_logging( + "usb", + "device", + &name, + log::LevelFilter::Info, + log::LevelFilter::Info, + ); log::info!( "USB HID driver spawned with scheme `{}`, port {}, interface {}", diff --git a/net/rtl8139d/src/main.rs b/net/rtl8139d/src/main.rs index aaf4a9bd70..03fd17dd52 100644 --- a/net/rtl8139d/src/main.rs +++ b/net/rtl8139d/src/main.rs @@ -102,14 +102,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 { } fn daemon(daemon: redox_daemon::Daemon) -> ! { - common::setup_logging( - "net", - "pcie", - "rtl8139", - log::LevelFilter::Info, - log::LevelFilter::Info, - ); - let mut pcid_handle = PciFunctionHandle::connect_default(); let pci_config = pcid_handle.config(); @@ -117,6 +109,14 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { let mut name = pci_config.func.name(); name.push_str("_rtl8139"); + common::setup_logging( + "net", + "pci", + &name, + log::LevelFilter::Info, + log::LevelFilter::Info, + ); + log::info!(" + RTL8139 {}", pci_config.func.display()); let bar = map_bar(&mut pcid_handle); diff --git a/net/rtl8168d/src/main.rs b/net/rtl8168d/src/main.rs index 27094eb481..59c25ba985 100644 --- a/net/rtl8168d/src/main.rs +++ b/net/rtl8168d/src/main.rs @@ -102,14 +102,6 @@ fn map_bar(pcid_handle: &mut PciFunctionHandle) -> *mut u8 { } fn daemon(daemon: redox_daemon::Daemon) -> ! { - common::setup_logging( - "net", - "pcie", - "rtl8168", - log::LevelFilter::Info, - log::LevelFilter::Info, - ); - let mut pcid_handle = PciFunctionHandle::connect_default(); let pci_config = pcid_handle.config(); @@ -117,6 +109,14 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { let mut name = pci_config.func.name(); name.push_str("_rtl8168"); + common::setup_logging( + "net", + "pci", + &name, + log::LevelFilter::Info, + log::LevelFilter::Info, + ); + log::info!(" + RTL8168 {}", pci_config.func.display()); let bar = map_bar(&mut pcid_handle); diff --git a/net/virtio-netd/src/main.rs b/net/virtio-netd/src/main.rs index ac4c2fa92b..c0231618f7 100644 --- a/net/virtio-netd/src/main.rs +++ b/net/virtio-netd/src/main.rs @@ -122,7 +122,7 @@ fn daemon_runner(redox_daemon: redox_daemon::Daemon) -> ! { pub fn main() { common::setup_logging( "net", - "pcie", + "pci", "virtio-netd", log::LevelFilter::Trace, log::LevelFilter::Trace, diff --git a/storage/ahcid/src/main.rs b/storage/ahcid/src/main.rs index 7108647bf7..3df8947f73 100644 --- a/storage/ahcid/src/main.rs +++ b/storage/ahcid/src/main.rs @@ -31,7 +31,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { common::setup_logging( "disk", - "pcie", + "pci", &name, log::LevelFilter::Info, log::LevelFilter::Info, diff --git a/storage/ided/src/main.rs b/storage/ided/src/main.rs index db96961807..45592aedf6 100644 --- a/storage/ided/src/main.rs +++ b/storage/ided/src/main.rs @@ -31,7 +31,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { common::setup_logging( "disk", - "pcie", + "pci", &name, log::LevelFilter::Info, log::LevelFilter::Info, diff --git a/storage/nvmed/src/main.rs b/storage/nvmed/src/main.rs index 013cc70589..ca0802c406 100644 --- a/storage/nvmed/src/main.rs +++ b/storage/nvmed/src/main.rs @@ -154,7 +154,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! { common::setup_logging( "disk", - "pcie", + "pci", &scheme_name, log::LevelFilter::Info, log::LevelFilter::Info, diff --git a/storage/virtio-blkd/src/main.rs b/storage/virtio-blkd/src/main.rs index 253eb9c572..b27343dce9 100644 --- a/storage/virtio-blkd/src/main.rs +++ b/storage/virtio-blkd/src/main.rs @@ -33,7 +33,7 @@ pub enum Error { pub fn main() -> anyhow::Result<()> { common::setup_logging( "disk", - "pcie", + "pci", "virtio-blkd", log::LevelFilter::Trace, log::LevelFilter::Trace, diff --git a/usb/usbhubd/src/main.rs b/usb/usbhubd/src/main.rs index 5d063d45b1..06a1550228 100644 --- a/usb/usbhubd/src/main.rs +++ b/usb/usbhubd/src/main.rs @@ -6,13 +6,6 @@ use xhcid_interface::{ }; fn main() { - common::setup_logging( - "usb", - "device", - "hub", - log::LevelFilter::Info, - log::LevelFilter::Info, - ); let mut args = env::args().skip(1); @@ -37,6 +30,15 @@ fn main() { interface_num ); + let name = format!("{}_{}_{}_hub", scheme, port, interface_num); + common::setup_logging( + "usb", + "device", + &name, + log::LevelFilter::Info, + log::LevelFilter::Info, + ); + let handle = XhciClientHandle::new(scheme.clone(), port_id); let desc: DevDesc = handle .get_standard_descs()