mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- small fixes to make the USB mouse work in Win98 and Linux

Browse Source 
- now the USB UHCI controller can be assigned to a PCI slot (by default it's a
  part of the PIIX3 chipset)
This commit is contained in:
Volker Ruppert 2009-02-15 08:16:16 +00:00
parent f10e0a08af
commit e11f9b6ce6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bochs/iodev/usb_uhci.cc
View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// $Id: usb_uhci.cc,v 1.6 2009-02-08 09:05:52 vruppert Exp $ // $Id: usb_uhci.cc,v 1.7 2009-02-15 08:16:16 vruppert Exp $
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net) // Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net)
@ -93,7 +93,11 @@ void bx_usb_uhci_c::init(void)
BX_UHCI_THIS hub.timer_index = BX_UHCI_THIS hub.timer_index =
bx_pc_system.register_timer(this, usb_timer_handler, 1000, 1,1, "usb.timer"); bx_pc_system.register_timer(this, usb_timer_handler, 1000, 1,1, "usb.timer");
BX_UHCI_THIS hub.devfunc = BX_PCI_DEVICE(1,2); if (DEV_is_pci_device(BX_PLUGIN_USB_UHCI)) {
BX_UHCI_THIS hub.devfunc = 0x00;
} else {
BX_UHCI_THIS hub.devfunc = BX_PCI_DEVICE(1,2);
}
DEV_register_pci_handlers(this, &BX_UHCI_THIS hub.devfunc, BX_PLUGIN_USB_UHCI, DEV_register_pci_handlers(this, &BX_UHCI_THIS hub.devfunc, BX_PLUGIN_USB_UHCI,
"Experimental USB UHCI"); "Experimental USB UHCI");
@ -724,8 +728,12 @@ void bx_usb_uhci_c::usb_timer(void)
if (td.dword1 & (1<<22)) stalled = 1; if (td.dword1 & (1<<22)) stalled = 1;
DEV_MEM_WRITE_PHYSICAL(address+4, 4, (Bit8u*) &td.dword1); // write back the status DEV_MEM_WRITE_PHYSICAL(address+4, 4, (Bit8u*) &td.dword1); // write back the status
if (shortpacket) {
td.dword0 |= 1;
stack[stk].t = 1;
}
// copy pointer for next queue item, in to vert queue head // copy pointer for next queue item, in to vert queue head
if ((stk > 0) && !shortpacket && (stack[stk].d == HC_VERT)) if ((stk > 0) && (stack[stk].d == HC_VERT))
DEV_MEM_WRITE_PHYSICAL(lastvertaddr, 4, (Bit8u*) &td.dword0); DEV_MEM_WRITE_PHYSICAL(lastvertaddr, 4, (Bit8u*) &td.dword0);
} }
} }