vasilito/RedBear-OS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adjust logging, ensure drivers get unique logfiles

Browse Source
This commit is contained in:
Jeremy Soller
2025-10-24 08:19:34 -06:00
parent 731d22366d
commit 8bf5d60e96
14 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
audio/ac97d/src/main.rs
+2 -2
View File
@@ -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,
);
audio/ihdad/src/hda/cmdbuff.rs
+1 -3
View File
@@ -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
audio/ihdad/src/main.rs
+8 -8
View File
@@ -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;
audio/sb16d/src/main.rs
+1 -1
View File
@@ -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,
graphics/virtio-gpud/src/main.rs
+1 -1
View File
@@ -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,
input/usbhidd/src/main.rs
+9 -8
View File
@@ -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 <scheme> <port> <interface>";
@@ -190,6 +182,15 @@ fn main() {
.expect(USAGE)
.parse::<u8>()
.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 {}",
net/rtl8139d/src/main.rs
+8 -8
View File
@@ -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);
net/rtl8168d/src/main.rs
+8 -8
View File
@@ -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);
net/virtio-netd/src/main.rs
+1 -1
View File
@@ -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,
storage/ahcid/src/main.rs
+1 -1
View File
@@ -31,7 +31,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
common::setup_logging(
"disk",
"pcie",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Info,
storage/ided/src/main.rs
+1 -1
View File
@@ -31,7 +31,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
common::setup_logging(
"disk",
"pcie",
"pci",
&name,
log::LevelFilter::Info,
log::LevelFilter::Info,
storage/nvmed/src/main.rs
+1 -1
View File
@@ -154,7 +154,7 @@ fn daemon(daemon: redox_daemon::Daemon) -> ! {
common::setup_logging(
"disk",
"pcie",
"pci",
&scheme_name,
log::LevelFilter::Info,
log::LevelFilter::Info,
storage/virtio-blkd/src/main.rs
+1 -1
View File
@@ -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,
usb/usbhubd/src/main.rs
+9 -7
View File
@@ -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()