Sinipelto/banan-os
1
0
Fork 0
forked from Bananymous/banan-os
Code Pull Requests Activity

Kernel: Cleanup xHCI debug printing

Browse Source
This commit is contained in:
Bananymous
2026-08-22 11:57:19 +03:00
parent b818e2764c
commit ffceb300db
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kernel/USB/XHCI/Controller.cpp
+12 -18
View File
@@ -396,14 +396,6 @@ namespace Kernel
dwarnln("FIXME: Using incorrect speed id, {} instead of {}", temp, speed_id); dwarnln("FIXME: Using incorrect speed id, {} instead of {}", temp, speed_id);
if (auto ret = initialize_device(i + 1, 0, speed_id_to_class(speed_id), nullptr, 0); !ret.is_error()) if (auto ret = initialize_device(i + 1, 0, speed_id_to_class(speed_id), nullptr, 0); !ret.is_error())
my_port.slot_id = ret.value(); my_port.slot_id = ret.value();
else
{
dwarnln("Could not initialize USB {H}.{H} device: {}",
my_port.revision_major,
my_port.revision_minor >> 4,
ret.error()
);
}
} }
} }
@@ -425,15 +417,14 @@ namespace Kernel
return BAN::Error::from_errno(EFAULT); return BAN::Error::from_errno(EFAULT);
} }
#if DEBUG_XHCI const uint8_t root_port_id = route_string & 0x0F;
const auto& root_port = m_ports[(route_string & 0x0F) - 1]; const auto& root_port = m_ports[root_port_id - 1];
dprintln("Initializing USB {H}.{H} device on slot {}", dprintln_if(DEBUG_XHCI, "Initializing USB {H}.{H} device on slot {}",
root_port.revision_major, root_port.revision_major,
root_port.revision_minor, root_port.revision_minor >> 4,
slot_id slot_id
); );
#endif
const XHCIDevice::Info info { const XHCIDevice::Info info {
.parent_hub = parent_hub, .parent_hub = parent_hub,
@@ -447,18 +438,21 @@ namespace Kernel
m_slots[slot_id - 1] = TRY(XHCIDevice::create(*this, info)); m_slots[slot_id - 1] = TRY(XHCIDevice::create(*this, info));
if (auto ret = m_slots[slot_id - 1]->initialize(); ret.is_error()) if (auto ret = m_slots[slot_id - 1]->initialize(); ret.is_error())
{ {
dwarnln("Could not initialize device on slot {}: {}", slot_id, ret.error()); dwarnln("Could not initialize USB {H}.{H} device on slot {}: {}",
root_port.revision_major,
root_port.revision_minor >> 4,
slot_id,
ret.error()
);
m_slots[slot_id - 1].clear(); m_slots[slot_id - 1].clear();
return ret.release_error(); return ret.release_error();
} }
#if DEBUG_XHCI dprintln_if(DEBUG_XHCI, "USB {H}.{H} device on slot {} initialized",
dprintln("USB {H}.{H} device on slot {} initialized",
root_port.revision_major, root_port.revision_major,
root_port.revision_minor, root_port.revision_minor >> 4,
slot_id slot_id
); );
#endif
return slot_id; return slot_id;
} }