Chameleon Commit Details - 552 - Chameleon open source boot loader project.

Date:

2010-09-26 05:15:35 (13 years 6 months ago)

Author:

Evan Lojewski

Commit:

552

Parents:

551

Message:

USB Fix for ion machines.

Changes:

M	/branches/meklort/i386/modules/USBFix/USBFix.c
M	/branches/meklort/i386/modules/USBFix/usb.c

File differences

-12
13 13
14 14
15 
16 
17 
15
16
17
18
18 19
19 20
20 21
+␊
void USBFix_pci_hook(pci_dt_t* current, void* arg2, void* arg3, void* arg4)␊
{␊
␉if(current->class_id != PCI_CLASS_SERIAL_USB) return;␊
␊
␉notify_usb_dev(current);␊
␉if(current->class_id == PCI_CLASS_SERIAL_USB)␊
␉{␊
␉␉notify_usb_dev(current);␊
␉}␊
}␊
␊
void USBFix_start_hook(void* arg1, void* arg2, void* arg3, void* arg4)␊
 ␊
 void USBFix_pci_hook(pci_dt_t* current, void* arg2, void* arg3, void* arg4)␊
 {␊
-␉if(current->class_id != PCI_CLASS_SERIAL_USB) return;␊
-␊
-␉notify_usb_dev(current);␊
+␉if(current->class_id == PCI_CLASS_SERIAL_USB)␊
+␉{␊
+␉␉notify_usb_dev(current);␊
+␉}␊
 }␊
 ␊
 void USBFix_start_hook(void* arg1, void* arg2, void* arg3, void* arg4)␊

-38
39 39
40 40
41 
42 41
43 42
44 43
... ...
87 86
88 87
89 88
90 
91 89
90
92 91
93 92
94 93
+// Add usb device to the list␊
void notify_usb_dev(pci_dt_t *pci_dev)␊
{␊
␉␊
␉struct pciList* current = usbList;␊
␉if(!usbList)␊
␉{␊

␉␉{␊
␉␉␉// EHCI␊
␉␉␉case 0x20:␊
␉␉    ␉if(fix_ehci)   retVal &= ehci_acquire(current->pciDev);␊
␉␉    ␉if(fix_legacy) retVal &= legacy_off(current->pciDev);␊
␉␉    ␉if(fix_ehci)   retVal &= ehci_acquire(current->pciDev);␊
␉␉␉␉␊
␉␉␉␉break;␊
␉␉␉␉␊
 ...
 // Add usb device to the list␊
 void notify_usb_dev(pci_dt_t *pci_dev)␊
 {␊
-␉␊
 ␉struct pciList* current = usbList;␊
 ␉if(!usbList)␊
 ␉{␊
 ␉␉{␊
 ␉␉␉// EHCI␊
 ␉␉␉case 0x20:␊
-␉␉    ␉if(fix_ehci)   retVal &= ehci_acquire(current->pciDev);␊
 ␉␉    ␉if(fix_legacy) retVal &= legacy_off(current->pciDev);␊
+␉␉    ␉if(fix_ehci)   retVal &= ehci_acquire(current->pciDev);␊
 ␉␉␉␉␊
 ␉␉␉␉break;␊
 ␉␉␉␉␊