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

- removed duplicate code from reset_hc(), since the init of connected devices

Browse Source 
is already done in reset()
- init_device(): check for device connected to port before creating a new one
  (OHCI and UHCI)
- update irq level after clearing status and masking interrupt (same behaviour
  as the Qemu implementation)
This commit is contained in:
Volker Ruppert 2009-02-15 14:06:55 +00:00
parent e11f9b6ce6
commit bf92a5ea04
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bochs/iodev/usb_ohci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: usb_ohci.cc,v 1.6 2009-02-14 10:06:20 vruppert Exp $
// $Id: usb_ohci.cc,v 1.7 2009-02-15 14:06:54 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net)
@ -351,12 +351,6 @@ void bx_usb_ohci_c::reset_hc()
BX_OHCI_THIS hub.usb_port[i].device = NULL;
}
}
BX_OHCI_THIS mousedev = NULL;
BX_OHCI_THIS keybdev = NULL;
init_device(0, SIM->get_param_string(BXPN_OHCI_PORT1)->getptr());
init_device(1, SIM->get_param_string(BXPN_OHCI_PORT2)->getptr());
}
void bx_usb_ohci_c::reset_port(int p)
@ -418,6 +412,11 @@ void bx_usb_ohci_c::init_device(Bit8u port, const char *devname)
if (!strlen(devname) || !strcmp(devname, "none")) return;
if (BX_OHCI_THIS hub.usb_port[port].device != NULL) {
BX_ERROR(("init_device(): port%d already in use", port+1));
return;
}
if (!strcmp(devname, "mouse")) {
type = USB_DEV_TYPE_MOUSE;
BX_OHCI_THIS hub.usb_port[port].device = new usb_hid_device_c(type);
@ -761,6 +760,7 @@ bx_bool bx_usb_ohci_c::write_handler(bx_phy_address addr, unsigned len, void *da
if (value & (1<< 2)) BX_OHCI_THIS hub.op_regs.HcInterruptStatus.sf = 0;
if (value & (1<< 1)) BX_OHCI_THIS hub.op_regs.HcInterruptStatus.wdh = 0;
if (value & (1<< 0)) BX_OHCI_THIS hub.op_regs.HcInterruptStatus.so = 0;
set_irq_state();
break;
case 0x10: // HcInterruptEnable
@ -790,6 +790,7 @@ bx_bool bx_usb_ohci_c::write_handler(bx_phy_address addr, unsigned len, void *da
if (value & (1<< 2)) BX_OHCI_THIS hub.op_regs.HcInterruptEnable.sf = 0;
if (value & (1<< 1)) BX_OHCI_THIS hub.op_regs.HcInterruptEnable.wdh = 0;
if (value & (1<< 0)) BX_OHCI_THIS hub.op_regs.HcInterruptEnable.so = 0;
set_irq_state();
break;
case 0x18: // HcHCCA

7
bochs/iodev/usb_uhci.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: usb_uhci.cc,v 1.7 2009-02-15 08:16:16 vruppert Exp $
// $Id: usb_uhci.cc,v 1.8 2009-02-15 14:06:55 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net)
@ -282,6 +282,11 @@ void bx_usb_uhci_c::init_device(Bit8u port, const char *devname)
if (!strlen(devname) || !strcmp(devname, "none")) return;
if (BX_UHCI_THIS hub.usb_port[port].device != NULL) {
BX_ERROR(("init_device(): port%d already in use", port+1));
return;
}
if (!strcmp(devname, "mouse")) {
type = USB_DEV_TYPE_MOUSE;
BX_UHCI_THIS hub.usb_port[port].device = new usb_hid_device_c(type);