i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XHCI/UHCI USB: forgot to get the x86 PCI module.

Browse Source
This commit is contained in:
Jerome Duval
2013-08-20 19:42:59 +02:00
parent c2cfbd70fe
commit a17e9da139
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/uhci.cpp
+8
View File
@@ -1973,6 +1973,14 @@ UHCI::AddTo(Stack *stack)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
// Try to get the PCI x86 module as well so we can enable possible MSIs.
if (sPCIx86Module == NULL && get_module(B_PCI_X86_MODULE_NAME,
(module_info **)&sPCIx86Module) != B_OK) {
// If it isn't there, that's not critical though.
TRACE_MODULE_ERROR("failed to get pci x86 module\n");
sPCIx86Module = NULL;
}
for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) { for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) {
if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb
src/add-ons/kernel/busses/usb/xhci.cpp
+8
View File
@@ -690,6 +690,14 @@ XHCI::AddTo(Stack *stack)
return B_NO_MEMORY; return B_NO_MEMORY;
} }
// Try to get the PCI x86 module as well so we can enable possible MSIs.
if (sPCIx86Module == NULL && get_module(B_PCI_X86_MODULE_NAME,
(module_info **)&sPCIx86Module) != B_OK) {
// If it isn't there, that's not critical though.
TRACE_MODULE_ERROR("failed to get pci x86 module\n");
sPCIx86Module = NULL;
}
for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) { for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) {
if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb
&& item->class_api == PCI_usb_xhci) { && item->class_api == PCI_usb_xhci) {