From 8589bf713bb7dc135820dfa296acc44d450a7b4a Mon Sep 17 00:00:00 2001 From: Daniel Samson <12231216+daniel-samson@users.noreply.github.com> Date: Mon, 13 Jul 2026 05:18:49 +0100 Subject: [PATCH] fix usb-xhci-bus debug prefix --- system/drivers/usb-xhci-bus/usb-xhci-bus.zig | 32 ++++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/system/drivers/usb-xhci-bus/usb-xhci-bus.zig b/system/drivers/usb-xhci-bus/usb-xhci-bus.zig index 2bec30a..74577bb 100644 --- a/system/drivers/usb-xhci-bus/usb-xhci-bus.zig +++ b/system/drivers/usb-xhci-bus/usb-xhci-bus.zig @@ -33,20 +33,20 @@ var controller_id: u64 = protocol.no_device; fn initialise(endpoint: runtime.ipc.Handle) bool { _ = endpoint; if (!device.claim(controller_id)) { - writeLine("usb-xhci-bus: unable to claim controller device {d}\n", .{controller_id}); + writeLine("system/drivers/usb-xhci-bus: unable to claim controller device {d}\n", .{controller_id}); return false; } // Fetch our own descriptor back for the controller's resources. const buffer = runtime.allocator().alloc(device.DeviceDescriptor, 64) catch { - _ = runtime.system.write("usb-xhci-bus: out of memory\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: out of memory\n"); return false; }; const total = device.enumerate(buffer); const descriptor = for (buffer[0..@min(total, buffer.len)]) |d| { if (d.id == controller_id) break d; } else { - writeLine("usb-xhci-bus: device {d} not in the device tree\n", .{controller_id}); + writeLine("system/drivers/usb-xhci-bus: device {d} not in the device tree\n", .{controller_id}); return false; }; @@ -59,16 +59,16 @@ fn initialise(endpoint: runtime.ipc.Handle) bool { break resource; } } else { - writeLine("usb-xhci-bus: controller device {d} has no register BAR\n", .{controller_id}); + writeLine("system/drivers/usb-xhci-bus: controller device {d} has no register BAR\n", .{controller_id}); return false; }; - writeLine("usb-xhci-bus: claimed controller device {d} (registers at 0x{x}, {d} bytes)\n", .{ + writeLine("system/drivers/usb-xhci-bus: claimed controller device {d} (registers at 0x{x}, {d} bytes)\n", .{ controller_id, register_window.start, register_window.len, }); register_base = device.mmioMap(controller_id, register_index) orelse { - _ = runtime.system.write("usb-xhci-bus: mmio_map failed\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: mmio_map failed\n"); return false; }; @@ -81,20 +81,20 @@ fn initialise(endpoint: runtime.ipc.Handle) bool { if (manager == null) runtime.system.sleep(20); } const h = manager orelse { - _ = runtime.system.write("usb-xhci-bus: no device manager to hello\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: no device manager to hello\n"); return false; }; const hello = protocol.Hello{ .role = @intFromEnum(protocol.Role.bus), .device_id = controller_id }; var reply: [protocol.message_maximum]u8 = undefined; const n = runtime.ipc.call(h, std.mem.asBytes(&hello), &reply) catch { - _ = runtime.system.write("usb-xhci-bus: hello call failed\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: hello call failed\n"); return false; }; if (n < protocol.reply_size or std.mem.bytesToValue(protocol.HelloReply, reply[0..protocol.reply_size]).status != 0) { - _ = runtime.system.write("usb-xhci-bus: hello refused\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: hello refused\n"); return false; } - _ = runtime.system.write("usb-xhci-bus: hello acknowledged\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: hello acknowledged\n"); scanPorts(h); return true; @@ -135,7 +135,7 @@ fn scanPorts(manager: runtime.ipc.Handle) void { const capability_length = readRegister(0) & 0xFF; const structural = readRegister(0x04); const maximum_ports: u32 = structural >> 24; - writeLine("usb-xhci-bus: {d} root-hub ports\n", .{maximum_ports}); + writeLine("system/drivers/usb-xhci-bus: {d} root-hub ports\n", .{maximum_ports}); // PORTSC registers: operational base + 0x400 + 0x10 per port (1-based). var port: u32 = 1; @@ -145,7 +145,7 @@ fn scanPorts(manager: runtime.ipc.Handle) void { if (port_status & 1 == 0) continue; // CCS: nothing connected connected += 1; const speed = (port_status >> 10) & 0xF; // the PORTSC port-speed class - writeLine("usb-xhci-bus: port {d} connected — {s} (speed class {d})\n", .{ port, speedName(speed), speed }); + writeLine("system/drivers/usb-xhci-bus: port {d} connected — {s} (speed class {d})\n", .{ port, speedName(speed), speed }); const report = protocol.ChildAdded{ .parent = controller_id, @@ -154,11 +154,11 @@ fn scanPorts(manager: runtime.ipc.Handle) void { }; var reply: [protocol.message_maximum]u8 = undefined; _ = runtime.ipc.call(manager, std.mem.asBytes(&report), &reply) catch { - writeLine("usb-xhci-bus: child report for port {d} failed\n", .{port}); + writeLine("system/drivers/usb-xhci-bus: child report for port {d} failed\n", .{port}); continue; }; } - if (connected == 0) _ = runtime.system.write("usb-xhci-bus: no devices connected\n"); + if (connected == 0) _ = runtime.system.write("system/drivers/usb-xhci-bus: no devices connected\n"); } /// No bus protocol to serve yet — transfer requests arrive with the USB track. @@ -172,11 +172,11 @@ fn onMessage(message: []const u8, reply: []u8, sender: u32, capability: ?runtime pub fn main(init: runtime.process.Init) void { const argument = init.arguments.get(1) orelse { - _ = runtime.system.write("usb-xhci-bus: missing controller device id (argv[1])\n"); + _ = runtime.system.write("system/drivers/usb-xhci-bus: missing controller device id (argv[1])\n"); return; }; controller_id = std.fmt.parseInt(u64, argument, 10) catch { - writeLine("usb-xhci-bus: malformed controller device id '{s}'\n", .{argument}); + writeLine("system/drivers/usb-xhci-bus: malformed controller device id '{s}'\n", .{argument}); return; }; runtime.service.run(protocol.message_maximum, .{