github/AROS-v0
1
0
Fork 0
mirror of https://github.com/deadw00d/AROS.git synced 2025-12-09 16:00:35 +00:00
Code Issues Releases Wiki Activity

old USB drivers: Get them to compile with new PCI interface

Browse Source 
Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com>

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@46592 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
This commit is contained in:
jmcmullan
2013-02-14 02:40:59 +00:00
parent a2bf057b7f
commit 88380f78f9
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workbench/devs/USB/drivers/UHCI/uhci_init.c
View File

@ -128,12 +128,8 @@ AROS_UFH3(void, Enumerator,
D(bug("[UHCI] Device %d @ %08x with IO @ %08x\n", counter, pciDevice, LIBBASE->sd.iobase[counter]));
struct pHidd_PCIDevice_WriteConfigWord wcw = {
OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_WriteConfigWord), PCI_LEGSUP, 0x8f00
};
D(bug("[UHCI] Performing full reset. Hopefull legacy USB will do it'S handoff at this time.\n"));
OOP_DoMethod(pciDevice, &wcw.mID);
HIDD_PCIDevice_WriteConfigWord(pciDevice, PCI_LEGSUP, 0x8f00);
outw(UHCI_CMD_HCRESET, LIBBASE->sd.iobase[counter] + UHCI_CMD);
struct timerequest *tr = USBCreateTimer();
@ -146,13 +142,7 @@ AROS_UFH3(void, Enumerator,
outw(0, LIBBASE->sd.iobase[counter] + UHCI_CMD);
D({
struct pHidd_PCIDevice_ReadConfigWord __msg = {
OOP_GetMethodID(CLID_Hidd_PCIDevice, moHidd_PCIDevice_ReadConfigWord), 0xc0
}, *msg = &__msg;
bug("[UHCI] 0xc0: %04x\n", OOP_DoMethod(pciDevice, msg));
});
D(bug("[UHCI] 0xc0: %04x\n", HIDD_PCIDevice_ReadConfigWord(pciDevice, 0xc0)));
LIBBASE->sd.num_devices = ++counter;
@ -171,7 +161,7 @@ static int UHCI_Init(LIBBASETYPEPTR LIBBASE)
return FALSE;
}
if ((LIBBASE->sd.pci=OOP_NewObject(NULL, (STRPTR)CLID_Hidd_PCI, NULL)))
if ((LIBBASE->sd.pci=OOP_NewObject(NULL, (STRPTR)IID_Hidd_PCI, NULL)))
{
struct TagItem tags[] = {
{ tHidd_PCI_Class, PCI_BASE_CLASS_SERIAL },