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

replaced with PCI.h definitions, added PCI_usb_ehci

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@18704 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2006-08-30 08:36:53 +00:00
parent d3669ef900
commit 2761c5ae55
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/drivers/PCI.h
+1
View File
@@ -480,6 +480,7 @@ struct pci_module_info {
#define PCI_usb_uhci 0x00 /* Universal Host Controller Interface */
#define PCI_usb_ohci 0x10 /* Open Host Controller Interface */
#define PCI_usb_ehci 0x20 /* Enhanced Host Controller Interface */
/* ---
src/add-ons/kernel/busses/usb/ehci.cpp
+3 -3
View File
@@ -256,9 +256,9 @@ EHCI::AddTo(Stack *stack)
}
for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) {
// class_base: 0C (Serial Bus); class_sub: 03 (USB); class_api: 20 (EHCI)
if (item->class_base == 0x0C && item->class_sub == 0x03
&& item->class_api == 0x20) {
if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb
&& item->class_api == PCI_usb_ehci) {
if (item->u.h0.interrupt_line == 0
|| item->u.h0.interrupt_line == 0xFF) {
TRACE_ERROR(("usb_ehci: found device with invalid IRQ - check IRQ assignement\n"));
src/add-ons/kernel/busses/usb/ohci.cpp
+2 -5
View File
@@ -115,11 +115,8 @@ ohci_add_to( Stack *stack )
item = new pci_info;
for ( i = 0 ; OHCI::pci_module->get_nth_pci_info( i , item ) == B_OK ; i++ )
{
//
// class_base = 0C (serial bus) class_sub = 03 (usb) prog_int: 10 (OHCI)
//
if ( ( item->class_base == 0x0C ) && ( item->class_sub == 0x03 ) &&
( item->class_api == 0x10 ) )
if ( ( item->class_base == PCI_serial_bus ) && ( item->class_sub == PCI_usb ) &&
( item->class_api == PCI_usb_ohci ) )
{
if ((item->u.h0.interrupt_line == 0) || (item->u.h0.interrupt_line == 0xFF))
{
src/add-ons/kernel/busses/usb/uhci.cpp
+3 -3
View File
@@ -1052,9 +1052,9 @@ UHCI::AddTo(Stack *stack)
}
for (int32 i = 0; sPCIModule->get_nth_pci_info(i, item) >= B_OK; i++) {
//class_base = 0C (serial bus) class_sub = 03 (usb) prog_int: 00 (UHCI)
if (item->class_base == 0x0C && item->class_sub == 0x03
&& item->class_api == 0x00) {
if (item->class_base == PCI_serial_bus && item->class_sub == PCI_usb
&& item->class_api == PCI_usb_uhci) {
if (item->u.h0.interrupt_line == 0
|| item->u.h0.interrupt_line == 0xFF) {
TRACE_ERROR(("usb_uhci: AddTo(): found with invalid IRQ - check IRQ assignement\n"));