mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86c7033a63
Bochs/bochs/iodev/usb/usb_ohci.cc

1544 lines
59 KiB
C++
Raw Normal View History

- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
/////////////////////////////////////////////////////////////////////////
Adding Id and Rev property to all files
2011-02-25 01:05:47 +03:00
// $Id$
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
/////////////////////////////////////////////////////////////////////////
//
- moved the USB stuff to the new subdirectory iodev/usb - TODO #1: do the same with the network and sound code - TODO #2: update MSVC workspace files
2012-01-14 16:36:32 +04:00
// Copyright (C) 2009 Benjamin D Lunt (fys at frontiernet net)
// 2009-2012 The Bochs Project
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
- removed wrong character from FSF address (converted invisible and useless 2-byte character) - updated FSF address in some files - added license to some files
2009-02-08 12:05:52 +03:00
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Updated FSF address
2009-02-08 00:05:31 +03:00
/////////////////////////////////////////////////////////////////////////
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// Experimental USB OHCI adapter
// Notes: See usb_common.cc
// Define BX_PLUGGABLE in files that can be compiled into plugins. For
// platforms that require a special tag on exported symbols, BX_PLUGGABLE
// is used to know when we are exporting symbols and when we are importing.
#define BX_PLUGGABLE
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
#include "iodev.h"
#if BX_SUPPORT_PCI && BX_SUPPORT_USB_OHCI
#include "pci.h"
#include "usb_common.h"
#include "usb_ohci.h"
#define LOG_THIS theUSB_OHCI->
bx_usb_ohci_c* theUSB_OHCI = NULL;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
const char *usb_ohci_port_name[] = {
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
"HCRevision ",
"HCControl ",
"HCCommandStatus ",
"HCInterruptStatus ",
"HCInterruptEnable ",
"HCInterruptDisable",
"HCHCCA ",
"HCPeriodCurrentED ",
"HCControlHeadED ",
"HCControlCurrentED",
"HCBulkHeadED ",
"HCBulkCurrentED ",
"HCDoneHead ",
"HCFmInterval ",
"HCFmRemaining ",
"HCFmNumber ",
"HCPeriodicStart ",
"HCLSThreshold ",
"HCRhDescriptorA ",
"HCRhDescriptorB ",
"HCRhStatus ",
"HCRhPortStatus0 ",
"HCRhPortStatus1 ",
"HCRhPortStatus2 ",
"HCRhPortStatus3 ",
" **unknown** "
};
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
// builtin configuration handling functions
Bit32s usb_ohci_options_parser(const char *context, int num_params, char *params[])
{
if (!strcmp(params[0], "usb_ohci")) {
bx_list_c *base = (bx_list_c*) SIM->get_param(BXPN_USB_OHCI);
for (int i = 1; i < num_params; i++) {
if (!strncmp(params[i], "enabled=", 8)) {
SIM->get_param_bool(BXPN_OHCI_ENABLED)->set(atol(&params[i][8]));
} else if (!strncmp(params[i], "port", 4)) {
- call functions for config and bochsrc parameter handling used by plugins from the siminterface (required by MSVC and maybe others)
2012-01-16 21:11:16 +04:00
if (SIM->parse_usb_port_params(context, 0, params[i], BX_N_USB_OHCI_PORTS, base) < 0) {
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
return -1;
}
} else if (!strncmp(params[i], "options", 7)) {
- call functions for config and bochsrc parameter handling used by plugins from the siminterface (required by MSVC and maybe others)
2012-01-16 21:11:16 +04:00
if (SIM->parse_usb_port_params(context, 1, params[i], BX_N_USB_OHCI_PORTS, base) < 0) {
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
return -1;
}
} else {
BX_ERROR(("%s: unknown parameter '%s' for usb_ohci ignored.", context, params[i]));
}
}
} else {
BX_PANIC(("%s: unknown directive '%s'", context, params[0]));
}
return 0;
}
Bit32s usb_ohci_options_save(FILE *fp)
{
bx_list_c *base = (bx_list_c*) SIM->get_param(BXPN_USB_OHCI);
- call functions for config and bochsrc parameter handling used by plugins from the siminterface (required by MSVC and maybe others)
2012-01-16 21:11:16 +04:00
SIM->write_usb_options(fp, BX_N_USB_OHCI_PORTS, base);
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
return 0;
}
// device plugin entry points
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
int libusb_ohci_LTX_plugin_init(plugin_t *plugin, plugintype_t type, int argc, char *argv[])
{
theUSB_OHCI = new bx_usb_ohci_c();
BX_REGISTER_DEVICE_DEVMODEL(plugin, type, theUSB_OHCI, BX_PLUGIN_USB_OHCI);
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
// add new configuration parameter for the config interface
- call functions for config and bochsrc parameter handling used by plugins from the siminterface (required by MSVC and maybe others)
2012-01-16 21:11:16 +04:00
SIM->init_usb_options("OHCI", "ohci", BX_N_USB_OHCI_PORTS);
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
// register add-on option for bochsrc and command line
SIM->register_addon_option("usb_ohci", usb_ohci_options_parser, usb_ohci_options_save);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
return 0; // Success
}
void libusb_ohci_LTX_plugin_fini(void)
{
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
SIM->unregister_addon_option("usb_ohci");
bx_list_c *menu = (bx_list_c*)SIM->get_param("ports.usb");
menu->remove("usb_ohci");
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
delete theUSB_OHCI;
}
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
// the device object
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
bx_usb_ohci_c::bx_usb_ohci_c()
{
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
put("usb_ohci", "OHCI");
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
memset((void*)&hub, 0, sizeof(bx_usb_ohci_t));
device_buffer = NULL;
- implemented "auto-off" status LED feature and removed old "iolight" code
2011-12-28 18:53:05 +04:00
hub.frame_timer_index = BX_NULL_TIMER_HANDLE;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
bx_usb_ohci_c::~bx_usb_ohci_c()
{
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
char pname[16];
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (BX_OHCI_THIS device_buffer != NULL)
delete [] BX_OHCI_THIS device_buffer;
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (int i=0; i<BX_N_USB_OHCI_PORTS; i++) {
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
sprintf(pname, "port%d.device", i+1);
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
SIM->get_param_string(pname, SIM->get_param(BXPN_USB_OHCI))->set_handler(NULL);
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
remove_device(i);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
BX_DEBUG(("Exit"));
}
void bx_usb_ohci_c::init(void)
{
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
unsigned i;
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
char pname[6];
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
bx_list_c *ohci, *port;
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
bx_param_string_c *device, *options;
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
- devices 'usb_ohci' and 'usb_uhci': moved config parameter creation and bochsrc option parsing to the plugin device code - added function bx_init_usb_options() to reduce code duplication - added log function names for 'usb_ohci' and 'usb_uhci' - documentation updates
2012-01-08 16:43:46 +04:00
// Read in values from config interface
ohci = (bx_list_c*) SIM->get_param(BXPN_USB_OHCI);
// Check if the device is disabled or not configured
if (!SIM->get_param_bool("enabled", ohci)->get()) {
BX_INFO(("USB OHCI disabled"));
BX_UNREGISTER_DEVICE_DEVMODEL("usb_ohci");
return;
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_OHCI_THIS device_buffer = new Bit8u[65536];
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// Call our frame timer routine every 1mS (1,000uS)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// Continuous and active
- implemented "auto-off" status LED feature and removed old "iolight" code
2011-12-28 18:53:05 +04:00
BX_OHCI_THIS hub.frame_timer_index =
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
bx_pc_system.register_timer(this, usb_frame_handler, 1000, 1,1, "ohci.frame_timer");
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_OHCI_THIS hub.devfunc = 0x00;
DEV_register_pci_handlers(this, &BX_OHCI_THIS hub.devfunc, BX_PLUGIN_USB_OHCI,
"Experimental USB OHCI");
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
for (i=0; i<256; i++)
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
BX_OHCI_THIS pci_conf[i] = 0x0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
BX_OHCI_THIS pci_base_address[0] = 0x0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_OHCI_THIS hub.ohci_done_count = 7;
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
BX_OHCI_THIS hub.use_control_head = 0;
BX_OHCI_THIS hub.use_bulk_head = 0;
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
BX_OHCI_THIS hub.sof_time = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
//FIXME: for now, we want a status bar // hub zero, port zero
- implemented "auto-off" status LED feature and removed old "iolight" code
2011-12-28 18:53:05 +04:00
BX_OHCI_THIS hub.statusbar_id = bx_gui->register_statusitem("OHCI", 1);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
bx_list_c *usb_rt = (bx_list_c*)SIM->get_param(BXPN_MENU_RUNTIME_USB);
- gui configuration fixes * cpu msrs: parameter type changed to filename (for "browse" button) * usb: box title no longer needed, since we have now a tab window
2011-01-22 19:49:00 +03:00
ohci->set_options(ohci->SHOW_PARENT);
- new implementation of the win32 runtime dialog based on the start menu dialog * removed old win32 runtime config dialog since the property sheet isn't compatible with the win32 ParamDialog * reorganized runtime parameter lists (usb and cdrom setup in device init) * renamed win32 StartMenuDialog() to MainMenuDialog() and some related name changes * added runtime support to the MainMenuDialog - win32 start/runtime menu: set keyboard focus to the start/continue button - win32paramdlg: SetParamList() now checks for list size changes to avoid crash
2009-03-30 00:48:17 +04:00
ohci->set_runtime_param(1);
usb_rt->add(ohci);
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (i=0; i<BX_N_USB_OHCI_PORTS; i++) {
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
sprintf(pname, "port%d", i+1);
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
port = (bx_list_c*)SIM->get_param(pname, ohci);
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
port->set_runtime_param(1);
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
device = (bx_param_string_c*)port->get_by_name("device");
device->set_handler(usb_param_handler);
device->set_runtime_param(1);
options = (bx_param_string_c*)port->get_by_name("options");
options->set_runtime_param(1);
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
BX_OHCI_THIS hub.usb_port[i].device = NULL;
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.ccs = 0;
BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.csc = 0;
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
}
- implemented new mechanism to update device config parameters that depend on each other. Devices can register a handler to update it's state after runtime configuration. The new method update_runtime_options() executes all registered device handlers before the simulation continues. - USB host controllers now using the new mechanism to handle the runtime device change (replaces the previous timer-based implementation). TODO: floppy and cdrom could use this feature, too) - improved USB device change messages
2011-06-11 23:38:52 +04:00
// register handler for correct device connect handling after runtime config
SIM->register_runtime_config_handler(BX_OHCI_THIS_PTR, runtime_config_handler);
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
BX_OHCI_THIS hub.device_change = 0;
- the status bar indicators for the USB HCs now show the data transfer
2009-04-06 13:30:26 +04:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_INFO(("USB OHCI initialized"));
}
void bx_usb_ohci_c::reset(unsigned type)
{
unsigned i;
if (type == BX_RESET_HARDWARE) {
static const struct reset_vals_t {
unsigned addr;
unsigned char val;
} reset_vals[] = {
{ 0x00, 0xC1 }, { 0x01, 0x11 }, // 0x11C1 = vendor
{ 0x02, 0x03 }, { 0x03, 0x58 }, // 0x5803 = device
{ 0x04, 0x06 }, { 0x05, 0x00 }, // command_io
{ 0x06, 0x10 }, { 0x07, 0x02 }, // status (bit 4 = 1, has capabilities list.)
{ 0x08, 0x11 }, // revision number
{ 0x09, 0x10 }, // interface
{ 0x0a, 0x03 }, // class_sub USB Host Controller
{ 0x0b, 0x0c }, // class_base Serial Bus Controller
{ 0x0D, 0x40 }, // bus latency
{ 0x0e, 0x00 }, // header_type_generic
// address space 0x10 - 0x13
{ 0x10, 0x00 }, { 0x11, 0x50 }, //
{ 0x12, 0x00 }, { 0x13, 0xE1 }, //
{ 0x2C, 0xC1 }, { 0x2D, 0x11 }, // subsystem vendor ID
{ 0x2E, 0x03 }, { 0x2F, 0x58 }, // subsystem ID
{ 0x34, 0x50 }, // offset of capabilities list within configuration space
{ 0x3c, 0x0B }, // IRQ
{ 0x3d, BX_PCI_INTD }, // INT
{ 0x3E, 0x03 }, // minimum time bus master needs PCI bus ownership, in 250ns units
{ 0x3F, 0x56 }, // maximum latency, in 250ns units (bus masters only) (read-only)
// capabilities list:
{ 0x50, 0x01 }, //
{ 0x51, 0x00 }, //
{ 0x52, 0x02 }, //
{ 0x53, 0x76 }, //
{ 0x54, 0x00 }, //
{ 0x55, 0x20 }, //
{ 0x56, 0x00 }, //
{ 0x57, 0x1F }, //
};
for (i = 0; i < sizeof(reset_vals) / sizeof(*reset_vals); ++i) {
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
BX_OHCI_THIS pci_conf[reset_vals[i].addr] = reset_vals[i].val;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_OHCI_THIS reset_hc();
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
void bx_usb_ohci_c::reset_hc()
{
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
int i;
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
char pname[6];
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// reset locals
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_OHCI_THIS hub.ohci_done_count = 7;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcRevision
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcRevision = 0x0110;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcControl
BX_OHCI_THIS hub.op_regs.HcControl.reserved = 0;
BX_OHCI_THIS hub.op_regs.HcControl.rwe = 0;
BX_OHCI_THIS hub.op_regs.HcControl.rwc = 0;
BX_OHCI_THIS hub.op_regs.HcControl.ir = 0;
BX_OHCI_THIS hub.op_regs.HcControl.hcfs = 0;
BX_OHCI_THIS hub.op_regs.HcControl.ble = 0;
BX_OHCI_THIS hub.op_regs.HcControl.cle = 0;
BX_OHCI_THIS hub.op_regs.HcControl.ie = 0;
BX_OHCI_THIS hub.op_regs.HcControl.ple = 0;
BX_OHCI_THIS hub.op_regs.HcControl.cbsr = 0;
// HcCommandStatus
BX_OHCI_THIS hub.op_regs.HcCommandStatus.reserved0 = 0x000000;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.soc = 0;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.reserved1 = 0x000000;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.ocr = 0;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf = 0;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf = 0;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.hcr = 0;
// HcInterruptStatus
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcInterruptStatus = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcInterruptEnable
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcInterruptEnable = OHCI_INTR_MIE;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcHCCA
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcHCCA = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcPeriodCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcPeriodCurrentED = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcControlHeadED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcControlHeadED = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcControlCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcControlCurrentED = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcBulkHeadED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcBulkHeadED = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcBulkCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcBulkCurrentED = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcDoneHead
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcDoneHead = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcFmInterval
BX_OHCI_THIS hub.op_regs.HcFmInterval.fit = 0;
BX_OHCI_THIS hub.op_regs.HcFmInterval.fsmps = 0;
BX_OHCI_THIS hub.op_regs.HcFmInterval.reserved = 0;
BX_OHCI_THIS hub.op_regs.HcFmInterval.fi = 0x2EDF;
// HcFmRemaining
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
BX_OHCI_THIS hub.op_regs.HcFmRemainingToggle = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcFmNumber
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcFmNumber = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcPeriodicStart
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcPeriodicStart = 0x00000000;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcLSThreshold
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcLSThreshold = 0x0628;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcRhDescriptorA
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.potpgt = 0x10;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.reserved = 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nocp = 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ocpm = 1;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.dt = 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nps = 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm = 1;
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ndp = BX_N_USB_OHCI_PORTS;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// HcRhDescriptorB
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm = ((1 << BX_N_USB_OHCI_PORTS) - 1) << 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.dr = 0x0000;
// HcRhStatus
BX_OHCI_THIS hub.op_regs.HcRhStatus.crwe = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.reserved0 = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.ocic = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.lpsc = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.drwe = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.reserved1 = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.oci = 0;
BX_OHCI_THIS hub.op_regs.HcRhStatus.lps = 0;
// HcRhPortStatus[x]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (i=0; i<BX_N_USB_OHCI_PORTS; i++) {
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
reset_port(i);
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
if (BX_OHCI_THIS hub.usb_port[i].device == NULL) {
sprintf(pname, "port%d", i+1);
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
init_device(i, (bx_list_c*)SIM->get_param(pname, SIM->get_param(BXPN_USB_OHCI)));
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
} else {
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
usb_set_connect_status(i, BX_OHCI_THIS hub.usb_port[i].device->get_type(), 1);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
void bx_usb_ohci_c::reset_port(int p)
{
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved0 = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prsc = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ocic = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pssc = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pesc = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved1 = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.lsda = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved2 = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prs = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.poci = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pss = 0;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pes = 0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
void bx_usb_ohci_c::register_state(void)
{
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
unsigned i;
char portnum[8];
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
bx_list_c *hub, *port, *reg;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
bx_list_c *list = new bx_list_c(SIM->get_bochs_root(), "usb_ohci", "USB OHCI State");
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
hub = new bx_list_c(list, "hub");
reg = new bx_list_c(hub, "HcControl");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_bool_c(reg, "rwe", &BX_OHCI_THIS hub.op_regs.HcControl.rwe);
new bx_shadow_bool_c(reg, "rwc", &BX_OHCI_THIS hub.op_regs.HcControl.rwc);
new bx_shadow_bool_c(reg, "ir", &BX_OHCI_THIS hub.op_regs.HcControl.ir);
new bx_shadow_num_c(reg, "hcfs", &BX_OHCI_THIS hub.op_regs.HcControl.hcfs);
new bx_shadow_bool_c(reg, "ble", &BX_OHCI_THIS hub.op_regs.HcControl.ble);
new bx_shadow_bool_c(reg, "cle", &BX_OHCI_THIS hub.op_regs.HcControl.cle);
new bx_shadow_bool_c(reg, "ie", &BX_OHCI_THIS hub.op_regs.HcControl.ie);
new bx_shadow_bool_c(reg, "ple", &BX_OHCI_THIS hub.op_regs.HcControl.ple);
new bx_shadow_num_c(reg, "cbsr", &BX_OHCI_THIS hub.op_regs.HcControl.cbsr);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
reg = new bx_list_c(hub, "HcCommandStatus");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_num_c(reg, "soc", &BX_OHCI_THIS hub.op_regs.HcCommandStatus.soc);
new bx_shadow_bool_c(reg, "ocr", &BX_OHCI_THIS hub.op_regs.HcCommandStatus.ocr);
new bx_shadow_bool_c(reg, "blf", &BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf);
new bx_shadow_bool_c(reg, "clf", &BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf);
new bx_shadow_bool_c(reg, "hcr", &BX_OHCI_THIS hub.op_regs.HcCommandStatus.hcr);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
new bx_shadow_num_c(hub, "HcInterruptStatus", &BX_OHCI_THIS hub.op_regs.HcInterruptStatus, BASE_HEX);
new bx_shadow_num_c(hub, "HcInterruptEnable", &BX_OHCI_THIS hub.op_regs.HcInterruptEnable, BASE_HEX);
new bx_shadow_num_c(hub, "HcHCCA", &BX_OHCI_THIS hub.op_regs.HcHCCA, BASE_HEX);
new bx_shadow_num_c(hub, "HcPeriodCurrentED", &BX_OHCI_THIS hub.op_regs.HcPeriodCurrentED, BASE_HEX);
new bx_shadow_num_c(hub, "HcControlHeadED", &BX_OHCI_THIS hub.op_regs.HcControlHeadED, BASE_HEX);
new bx_shadow_num_c(hub, "HcControlCurrentED", &BX_OHCI_THIS hub.op_regs.HcControlCurrentED, BASE_HEX);
new bx_shadow_num_c(hub, "HcBulkHeadED", &BX_OHCI_THIS hub.op_regs.HcBulkHeadED, BASE_HEX);
new bx_shadow_num_c(hub, "HcBulkCurrentED", &BX_OHCI_THIS hub.op_regs.HcBulkCurrentED, BASE_HEX);
new bx_shadow_num_c(hub, "HcDoneHead", &BX_OHCI_THIS hub.op_regs.HcDoneHead, BASE_HEX);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
reg = new bx_list_c(hub, "HcFmInterval");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_bool_c(reg, "fit", &BX_OHCI_THIS hub.op_regs.HcFmInterval.fit);
new bx_shadow_num_c(reg, "fsmps", &BX_OHCI_THIS hub.op_regs.HcFmInterval.fsmps);
new bx_shadow_num_c(reg, "fi", &BX_OHCI_THIS hub.op_regs.HcFmInterval.fi, BASE_HEX);
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
new bx_shadow_bool_c(hub, "HcFmRemainingToggle", &BX_OHCI_THIS hub.op_regs.HcFmRemainingToggle);
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
new bx_shadow_num_c(hub, "HcFmNumber", &BX_OHCI_THIS hub.op_regs.HcFmNumber, BASE_HEX);
new bx_shadow_num_c(hub, "HcPeriodicStart", &BX_OHCI_THIS hub.op_regs.HcPeriodicStart, BASE_HEX);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
reg = new bx_list_c(hub, "HcRhDescriptorA");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_num_c(reg, "potpgt", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.potpgt, BASE_HEX);
new bx_shadow_bool_c(reg, "nocp", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nocp);
new bx_shadow_bool_c(reg, "ocpm", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ocpm);
new bx_shadow_bool_c(reg, "dt", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.dt);
new bx_shadow_bool_c(reg, "nps", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nps);
new bx_shadow_bool_c(reg, "psm", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm);
new bx_shadow_num_c(reg, "ndp", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ndp);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
reg = new bx_list_c(hub, "HcRhDescriptorB");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_num_c(reg, "ppcm", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm, BASE_HEX);
new bx_shadow_num_c(reg, "dr", &BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.dr, BASE_HEX);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
reg = new bx_list_c(hub, "HcRhStatus");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_bool_c(reg, "crwe", &BX_OHCI_THIS hub.op_regs.HcRhStatus.crwe);
new bx_shadow_bool_c(reg, "ocic", &BX_OHCI_THIS hub.op_regs.HcRhStatus.ocic);
new bx_shadow_bool_c(reg, "lpsc", &BX_OHCI_THIS hub.op_regs.HcRhStatus.lpsc);
new bx_shadow_bool_c(reg, "drwe", &BX_OHCI_THIS hub.op_regs.HcRhStatus.drwe);
new bx_shadow_bool_c(reg, "oci", &BX_OHCI_THIS hub.op_regs.HcRhStatus.oci);
new bx_shadow_bool_c(reg, "lps", &BX_OHCI_THIS hub.op_regs.HcRhStatus.lps);
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (i=0; i<BX_N_USB_OHCI_PORTS; i++) {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
sprintf(portnum, "port%d", i+1);
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
port = new bx_list_c(hub, portnum);
reg = new bx_list_c(port, "HcRhPortStatus");
- completed save/restore code - CSC bit must be set on a connect change - debug message fixed
2009-03-01 13:17:21 +03:00
new bx_shadow_bool_c(reg, "prsc", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.prsc);
new bx_shadow_bool_c(reg, "ocic", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.ocic);
new bx_shadow_bool_c(reg, "pssc", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.pssc);
new bx_shadow_bool_c(reg, "pesc", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.pesc);
new bx_shadow_bool_c(reg, "csc", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.csc);
new bx_shadow_bool_c(reg, "lsda", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.lsda);
new bx_shadow_bool_c(reg, "pps", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.pps);
new bx_shadow_bool_c(reg, "prs", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.prs);
new bx_shadow_bool_c(reg, "poci", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.poci);
new bx_shadow_bool_c(reg, "pss", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.pss);
new bx_shadow_bool_c(reg, "pes", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.pes);
new bx_shadow_bool_c(reg, "ccs", &BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.ccs);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// empty list for USB device state
- class bx_list_c now contains a chained list of parameters. Removed the now obsolete maxsize parameter from all lists.
2012-02-12 22:43:20 +04:00
new bx_list_c(port, "device");
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
new bx_shadow_num_c(hub, "ohci_done_count", &BX_OHCI_THIS hub.ohci_done_count, BASE_DEC);
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
new bx_shadow_bool_c(hub, "use_control_head", &BX_OHCI_THIS hub.use_control_head);
new bx_shadow_bool_c(hub, "use_bulk_head", &BX_OHCI_THIS hub.use_bulk_head);
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
new bx_shadow_num_c(hub, "sof_time", &BX_OHCI_THIS hub.sof_time);
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
register_pci_state(hub);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
void bx_usb_ohci_c::after_restore_state(void)
{
if (DEV_pci_set_base_mem(BX_OHCI_THIS_PTR, read_handler, write_handler,
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
&BX_OHCI_THIS pci_base_address[0],
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
&BX_OHCI_THIS pci_conf[0x10],
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
4096)) {
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
BX_INFO(("new base address: 0x%04x", BX_OHCI_THIS pci_base_address[0]));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (int j=0; j<BX_N_USB_OHCI_PORTS; j++) {
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (BX_OHCI_THIS hub.usb_port[j].device != NULL) {
BX_OHCI_THIS hub.usb_port[j].device->after_restore_state();
}
}
}
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
void bx_usb_ohci_c::init_device(Bit8u port, bx_list_c *portconf)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
{
- preparing USB cdrom support (not yet complete) * added cdrom support in the usb_msd code (already present in the SCSI code) * added code for deferring packets in usb_msd and the common USB code (TODO: cancel packets by the host controller) * added SCSI cdrom drive lock flag - clean up SCSI request queues in destructor - changed type of cdrom path/device parameter to const char - moved the shared init device code to a common function - reset hub count if the last external hub has been removed
2009-03-09 15:18:40 +03:00
usbdev_type type;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
char pname[BX_PATHNAME_LEN];
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
const char *devname = NULL;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
devname = ((bx_param_string_c*)portconf->get_by_name("device"))->getptr();
if (devname == NULL) return;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (!strlen(devname) || !strcmp(devname, "none")) return;
- removed duplicate code from reset_hc(), since the init of connected devices 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)
2009-02-15 17:06:55 +03:00
if (BX_OHCI_THIS hub.usb_port[port].device != NULL) {
BX_ERROR(("init_device(): port%d already in use", port+1));
return;
}
- modified usb_common plugin implementation to make Windows DLL plugins compile * added new "pseudo device" for the USB device control (init, send message) * moved register_state() call from the hubs to the common device init code - fixed unresolved symbols in usb_msd code
2010-12-15 00:20:37 +03:00
sprintf(pname, "usb_ohci.hub.port%d.device", port+1);
bx_list_c *sr_list = (bx_list_c*)SIM->get_param(pname, SIM->get_bochs_root());
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
type = DEV_usb_init_device(portconf, BX_OHCI_THIS_PTR, &BX_OHCI_THIS hub.usb_port[port].device, sr_list);
- preparing USB cdrom support (not yet complete) * added cdrom support in the usb_msd code (already present in the SCSI code) * added code for deferring packets in usb_msd and the common USB code (TODO: cancel packets by the host controller) * added SCSI cdrom drive lock flag - clean up SCSI request queues in destructor - changed type of cdrom path/device parameter to const char - moved the shared init device code to a common function - reset hub count if the last external hub has been removed
2009-03-09 15:18:40 +03:00
if (BX_OHCI_THIS hub.usb_port[port].device != NULL) {
usb_set_connect_status(port, type, 1);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
void bx_usb_ohci_c::remove_device(Bit8u port)
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
{
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
char pname[BX_PATHNAME_LEN];
if (BX_OHCI_THIS hub.usb_port[port].device != NULL) {
delete BX_OHCI_THIS hub.usb_port[port].device;
BX_OHCI_THIS hub.usb_port[port].device = NULL;
sprintf(pname, "usb_ohci.hub.port%d.device", port+1);
bx_list_c *devlist = (bx_list_c*)SIM->get_param(pname, SIM->get_bochs_root());
devlist->clear();
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
void bx_usb_ohci_c::update_irq()
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
{
bx_bool level = 0;
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if ((BX_OHCI_THIS hub.op_regs.HcInterruptEnable & OHCI_INTR_MIE) &&
(BX_OHCI_THIS hub.op_regs.HcInterruptStatus & BX_OHCI_THIS hub.op_regs.HcInterruptEnable)) {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
level = 1;
BX_DEBUG(("Interrupt Fired."));
}
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
DEV_pci_set_irq(BX_OHCI_THIS hub.devfunc, BX_OHCI_THIS pci_conf[0x3d], level);
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
void bx_usb_ohci_c::set_interrupt(Bit32u value)
{
BX_OHCI_THIS hub.op_regs.HcInterruptStatus |= value;
update_irq();
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
}
bx_bool bx_usb_ohci_c::read_handler(bx_phy_address addr, unsigned len, void *data, void *param)
{
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
Bit32u val = 0x0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
int p = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (len != 4) {
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_INFO(("Read at 0x%08X with len != 4 (%i)", (Bit32u)addr, len));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
return 1;
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
if (addr & 3) {
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_INFO(("Misaligned read at 0x%08X", (Bit32u)addr));
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
return 1;
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
Bit32u offset = (Bit32u)(addr - BX_OHCI_THIS pci_base_address[0]);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
switch (offset) {
case 0x00: // HcRevision
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
val = BX_OHCI_THIS hub.op_regs.HcRevision;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x04: // HcControl
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcControl.reserved << 11)
| (BX_OHCI_THIS hub.op_regs.HcControl.rwe ? 1 << 10 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.rwc ? 1 << 9 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.ir ? 1 << 8 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.hcfs << 6)
| (BX_OHCI_THIS hub.op_regs.HcControl.ble ? 1 << 5 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.cle ? 1 << 4 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.ie ? 1 << 3 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.ple ? 1 << 2 : 0)
| (BX_OHCI_THIS hub.op_regs.HcControl.cbsr << 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x08: // HcCommandStatus
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcCommandStatus.reserved0 << 18)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.soc << 16)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.reserved1 << 4)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.ocr ? 1 << 3 : 0)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf ? 1 << 2 : 0)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf ? 1 << 1 : 0)
| (BX_OHCI_THIS hub.op_regs.HcCommandStatus.hcr ? 1 << 0 : 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x0C: // HcInterruptStatus
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcInterruptStatus;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x10: // HcInterruptEnable
case 0x14: // HcInterruptDisable (reading this one returns that one)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcInterruptEnable;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x18: // HcHCCA
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcHCCA;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x1C: // HcPeriodCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcPeriodCurrentED;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x20: // HcControlHeadED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcControlHeadED;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x24: // HcControlCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcControlCurrentED;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x28: // HcBulkHeadED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcBulkHeadED;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x2C: // HcBulkCurrentED
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcBulkCurrentED;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x30: // HcDoneHead
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
val = BX_OHCI_THIS hub.op_regs.HcDoneHead;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x34: // HcFmInterval
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcFmInterval.fit ? 1 << 31 : 0)
| (BX_OHCI_THIS hub.op_regs.HcFmInterval.fsmps << 16)
| (BX_OHCI_THIS hub.op_regs.HcFmInterval.reserved << 14)
| (BX_OHCI_THIS hub.op_regs.HcFmInterval.fi << 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x38: // HcFmRemaining
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
val = get_frame_remaining();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x3C: // HcFmNumber
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
val = BX_OHCI_THIS hub.op_regs.HcFmNumber;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x40: // HcPeriodicStart
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
val = BX_OHCI_THIS hub.op_regs.HcPeriodicStart;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x44: // HcLSThreshold
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
val = BX_OHCI_THIS hub.op_regs.HcLSThreshold;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x48: // HcRhDescriptorA
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.potpgt << 24)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.reserved << 13)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nocp ? 1 << 12 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ocpm ? 1 << 11 : 0)
| 0 //BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.dt << 10
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nps ? 1 << 9 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm ? 1 << 8 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ndp << 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x4C: // HcRhDescriptorB
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm << 16)
| (BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.dr << 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x50: // HcRhStatus
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
val = (BX_OHCI_THIS hub.op_regs.HcRhStatus.crwe ? 1 << 31 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.reserved0 << 18)
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.ocic ? 1 << 17 : 0)
| 0 //BX_OHCI_THIS hub.op_regs.HcRhStatus.lpsc << 16
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.drwe ? 1 << 15 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.reserved1 << 2)
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.oci ? 1 << 1 : 0)
| (BX_OHCI_THIS hub.op_regs.HcRhStatus.lps ? 1 << 0 : 0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x60: // HcRhPortStatus[3]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 4)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
val = 0;
break;
#endif
case 0x5C: // HcRhPortStatus[2]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 3)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
val = 0;
break;
#endif
case 0x58: // HcRhPortStatus[1]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 2)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
val = 0;
break;
#endif
case 0x54: // HcRhPortStatus[0]
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
p = (offset - 0x54) >> 2;
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps == 1) {
val = (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved0 << 21)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prsc ? (1 << 20) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ocic ? (1 << 19) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pssc ? (1 << 18) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pesc ? (1 << 17) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.csc ? (1 << 16) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved1 << 10)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.lsda ? (1 << 9) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps ? (1 << 8) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.reserved2 << 5)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prs ? (1 << 4) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.poci ? (1 << 3) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pss ? (1 << 2) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pes ? (1 << 1) : 0)
| (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ccs ? (1 << 0) : 0);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
} else
val = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
default:
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_ERROR(("unsupported read from address=0x%08X!", (Bit32u)addr));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
int name = offset >> 2;
if (name > (0x60 >> 2))
name = 25;
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
//BX_INFO(("register read from address 0x%04X (%s): 0x%08X (len=%i)", (unsigned) addr, usb_ohci_port_name[name], (Bit32u) val, len));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
*((Bit32u *) data) = val;
return 1;
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
bx_bool bx_usb_ohci_c::write_handler(bx_phy_address addr, unsigned len, void *data, void *param)
{
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
Bit32u value = *((Bit32u *) data);
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
Bit32u offset = (Bit32u)addr - BX_OHCI_THIS pci_base_address[0];
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
int p, org_state;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
int name = offset >> 2;
if (name > (0x60 >> 2))
name = 25;
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
//BX_INFO(("register write to address 0x%04X (%s): 0x%08X (len=%i)", (unsigned) addr, usb_ohci_port_name[name], (unsigned) value, len));
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (len != 4) {
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_INFO(("Write at 0x%08X with len != 4 (%i)", (Bit32u)addr, len));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
return 1;
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
if (addr & 3) {
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_INFO(("Misaligned write at 0x%08X", (Bit32u)addr));
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
return 1;
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
switch (offset) {
case 0x00: // HcRevision
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_ERROR(("Write to HcRevision ignored"));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x04: // HcControl
if (value & 0xFFFFF800)
BX_ERROR(("Write to reserved field in HcControl"));
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
org_state = BX_OHCI_THIS hub.op_regs.HcControl.hcfs;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_OHCI_THIS hub.op_regs.HcControl.rwe = (value & (1<<10)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.rwc = (value & (1<< 9)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.ir = (value & (1<< 8)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.hcfs = (value & (3<< 6)) >> 6;
BX_OHCI_THIS hub.op_regs.HcControl.ble = (value & (1<< 5)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.cle = (value & (1<< 4)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.ie = (value & (1<< 3)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.ple = (value & (1<< 2)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcControl.cbsr = (value & (3<< 0)) >> 0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (BX_OHCI_THIS hub.op_regs.HcControl.hcfs == 0x02) {
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
BX_OHCI_THIS hub.op_regs.HcFmRemainingToggle = 0;
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
if (org_state != 2)
BX_OHCI_THIS hub.use_control_head = BX_OHCI_THIS hub.use_bulk_head = 1;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x08: // HcCommandStatus
if (value & 0xFFFCFFF0)
BX_ERROR(("Write to a reserved field in HcCommandStatus"));
if (value & (3<<16))
BX_ERROR(("Write to R/O field: HcCommandStatus.soc"));
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (value & (1<< 3)) BX_OHCI_THIS hub.op_regs.HcCommandStatus.ocr = 1;
if (value & (1<< 2)) BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf = 1;
if (value & (1<< 1)) BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf = 1;
if (value & (1<< 0)) {
BX_OHCI_THIS hub.op_regs.HcCommandStatus.hcr = 1;
BX_OHCI_THIS reset_hc();
BX_OHCI_THIS hub.op_regs.HcControl.hcfs = 3; // suspend state
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (unsigned i=0; i<BX_N_USB_OHCI_PORTS; i++)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if (BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.ccs && (BX_OHCI_THIS hub.usb_port[i].device != NULL))
- modified usb_common plugin implementation to make Windows DLL plugins compile * added new "pseudo device" for the USB device control (init, send message) * moved register_state() call from the hubs to the common device init code - fixed unresolved symbols in usb_msd code
2010-12-15 00:20:37 +03:00
DEV_usb_send_msg(BX_OHCI_THIS hub.usb_port[i].device, USB_MSG_RESET);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
case 0x0C: // HcInterruptStatus /// all are WC
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & 0xBFFFFF80)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_DEBUG(("Write to a reserved field in HcInterruptStatus"));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcInterruptStatus &= ~value;
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
update_irq();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x10: // HcInterruptEnable
if (value & 0x3FFFFF80)
BX_ERROR(("Write to a reserved field in HcInterruptEnable"));
- improved device cleanup in destructor - initialize device pointers in init() - only connect devices in reset() if not NULL - don't delete devices in reset_hc() to avoid segfault (update connect status instead) - fixed port number calculation in read handler - fixed enabling interrupts
2009-02-25 21:18:57 +03:00
BX_OHCI_THIS hub.op_regs.HcInterruptEnable |= (value & 0xC000007F);
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
update_irq();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x14: // HcInterruptDisable
if (value & 0x3FFFFF80)
BX_ERROR(("Write to a reserved field in HcInterruptDisable"));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcInterruptEnable &= ~value;
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
update_irq();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x18: // HcHCCA
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// the HCD can write 0xFFFFFFFF to this register to see what the alignement is
// by reading back the amount and seeing how many lower bits are clear.
if ((value & 0x000000FF) && (value != 0xFFFFFFFF))
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
BX_ERROR(("Write to lower byte of HcHCCA non zero."));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcHCCA = (value & 0xFFFFFF00);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x1C: // HcPeriodCurrentED
BX_ERROR(("Write to HcPeriodCurrentED not allowed."));
break;
case 0x20: // HcControlHeadED
if (value & 0x0000000F)
BX_ERROR(("Write to lower nibble of HcControlHeadED non zero."));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcControlHeadED = (value & 0xFFFFFFF0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x24: // HcControlCurrentED
if (value & 0x0000000F)
BX_ERROR(("Write to lower nibble of HcControlCurrentED non zero."));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcControlCurrentED = (value & 0xFFFFFFF0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x28: // HcBulkHeadED
if (value & 0x0000000F)
BX_ERROR(("Write to lower nibble of HcBulkHeadED non zero."));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcBulkHeadED = (value & 0xFFFFFFF0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x2C: // HcBulkCurrentED
if (value & 0x0000000F)
BX_ERROR(("Write to lower nibble of HcBulkCurrentED non zero."));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcBulkCurrentED = (value & 0xFFFFFFF0);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x30: // HcDoneHead
BX_ERROR(("Write to HcDoneHead not allowed."));
break;
case 0x34: // HcFmInterval
if (value & 0x0000C000)
BX_ERROR(("Write to a reserved field in HcFmInterval."));
BX_OHCI_THIS hub.op_regs.HcFmInterval.fit = (value & (1<<31)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcFmInterval.fsmps = (value & 0x7FFF0000) >> 16;
BX_OHCI_THIS hub.op_regs.HcFmInterval.fi = (value & 0x00003FFF) >> 0;
break;
case 0x38: // HcFmRemaining
BX_ERROR(("Write to HcFmRemaining not allowed."));
break;
case 0x3C: // HcFmNumber
BX_ERROR(("Write to HcFmNumber not allowed."));
break;
case 0x40: // HcPeriodicStart
if (value & 0xFFFFC000)
BX_ERROR(("Write to a reserved field in HcPeriodicStart."));
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcPeriodicStart = (value & 0x00003FFF);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x44: // HcLSThreshold
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_ERROR(("Write to HcLSThreshold not allowed."));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x48: // HcRhDescriptorA
if (value & 0x00FFE000)
BX_ERROR(("Write to a reserved field in HcRhDescriptorA."));
if (value & 0x000000FF)
BX_ERROR(("Write to HcRhDescriptorA.ndp not allowed."));
if (value & (1<<10))
BX_ERROR(("Write to HcRhDescriptorA.dt not allowed."));
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.potpgt = (value & 0xFF000000) >> 24;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nocp = (value & (1<<12)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.ocpm = (value & (1<<11)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.nps = (value & (1<< 9)) ? 1 : 0;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm = (value & (1<< 8)) ? 1 : 0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm == 0) {
BX_INFO(("Ben: BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm == 0"));
// all ports have power, etc.
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
// BX_USB_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 1
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// Call a routine to set each ports dword (LS, Connected, etc.)
} else {
BX_INFO(("Ben: BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm == 1"));
// only ports with bit set in rhstatus have power, etc.
// Call a routine to set each ports dword (LS, Connected, etc.)
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
case 0x4C: // HcRhDescriptorB
BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm = (value & 0xFFFF0000) >> 16;
BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.dr = (value & 0x0000FFFF) >> 0;
break;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
case 0x50: { // HcRhStatus
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & 0x7FFC7FFC)
BX_ERROR(("Write to a reserved field in HcRhStatus."));
if (value & (1<<1))
BX_ERROR(("Write to HcRhStatus.oci not allowed."));
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// which one of these two takes presidence?
if (value & (1<<31)) BX_OHCI_THIS hub.op_regs.HcRhStatus.drwe = 0;
if (value & (1<<15)) BX_OHCI_THIS hub.op_regs.HcRhStatus.drwe = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (value & (1<<17)) BX_OHCI_THIS hub.op_regs.HcRhStatus.ocic = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<16)) {
if (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm == 0) {
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (p=0; p<BX_N_USB_OHCI_PORTS; p++)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
} else {
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (p=0; p<BX_N_USB_OHCI_PORTS; p++)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if ((BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)) == 0)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
if (value & (1<<0)) {
if (BX_OHCI_THIS hub.op_regs.HcRhDescriptorA.psm == 0) {
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (p=0; p<BX_N_USB_OHCI_PORTS; p++)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
} else {
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (p=0; p<BX_N_USB_OHCI_PORTS; p++)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (!(BX_OHCI_THIS hub.op_regs.HcRhDescriptorB.ppcm & (1<<p)))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
break;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
case 0x60: // HcRhPortStatus[3]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 4)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
#endif
case 0x5C: // HcRhPortStatus[2]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 3)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
#endif
case 0x58: // HcRhPortStatus[1]
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
#if (BX_N_USB_OHCI_PORTS < 2)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
#endif
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
case 0x54: { // HcRhPortStatus[0]
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
p = (offset - 0x54) >> 2;
if (value & 0xFFE0FCE0)
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_ERROR(("Write to a reserved field in usb_port[%d].HcRhPortStatus", p));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<0))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pes = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<1)) {
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ccs == 0)
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.csc = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
else
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pes = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
if (value & (1<<2)) {
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ccs == 0)
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.csc = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
else
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pss = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
// if (value & (1<<3))
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
// if (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pss)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// ; // do a resume (or test this in the timer code and do the resume there)
if (value & (1<<4)) {
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
if (BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ccs == 0)
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.csc = 1;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
else {
reset_port(p);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 1;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pes = 1;
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prsc = 1;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// are we are currently connected/disconnected
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (BX_OHCI_THIS hub.usb_port[p].device != NULL) {
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.lsda =
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
(BX_OHCI_THIS hub.usb_port[p].device->get_speed() == USB_SPEED_LOW);
usb_set_connect_status(p, BX_OHCI_THIS hub.usb_port[p].device->get_type(), 1);
- modified usb_common plugin implementation to make Windows DLL plugins compile * added new "pseudo device" for the USB device control (init, send message) * moved register_state() call from the hubs to the common device init code - fixed unresolved symbols in usb_msd code
2010-12-15 00:20:37 +03:00
DEV_usb_send_msg(BX_OHCI_THIS hub.usb_port[p].device, USB_MSG_RESET);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
set_interrupt(OHCI_INTR_RHSC);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
if (value & (1<<8))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 1;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<9))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pps = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<16))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.csc = (value & ((1<<4) | (1<<1) | (1<<2))) ? 1 : 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<17))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pesc = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<18))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.pssc = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<19))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.ocic = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (value & (1<<20))
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[p].HcRhPortStatus.prsc = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
default:
- fixed some format warnings in the devices code
2011-01-02 19:51:08 +03:00
BX_ERROR(("unsupported write to address=0x%08X, val = 0x%08X!", (Bit32u)addr, value));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
break;
}
return 1;
}
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
Bit32u bx_usb_ohci_c::get_frame_remaining(void)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
{
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
Bit16u bit_time, fr;
bit_time = (Bit16u)((bx_pc_system.time_usec() - BX_OHCI_THIS hub.sof_time) * 12);
if ((BX_OHCI_THIS hub.op_regs.HcControl.hcfs != 2) ||
(bit_time > BX_OHCI_THIS hub.op_regs.HcFmInterval.fi)) {
fr = 0;
} else {
fr = BX_OHCI_THIS hub.op_regs.HcFmInterval.fi - bit_time;
}
return (BX_OHCI_THIS hub.op_regs.HcFmRemainingToggle << 31) | fr;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
void bx_usb_ohci_c::usb_frame_handler(void *this_ptr)
{
bx_usb_ohci_c *class_ptr = (bx_usb_ohci_c *) this_ptr;
class_ptr->usb_frame_timer();
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// Called once every 1mS
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
void bx_usb_ohci_c::usb_frame_timer(void)
{
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
struct OHCI_ED cur_ed;
Bit32u address, ed_address;
Bit16u zero = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (BX_OHCI_THIS hub.op_regs.HcControl.hcfs == 2) {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
// set remaining to the interval amount.
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
BX_OHCI_THIS hub.op_regs.HcFmRemainingToggle = BX_OHCI_THIS hub.op_regs.HcFmInterval.fit;
BX_OHCI_THIS hub.sof_time = bx_pc_system.time_usec();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// The Frame Number Register is incremented
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
// every time bit 15 is changed (at 0x8000 or 0x0000), fno is fired.
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
BX_OHCI_THIS hub.op_regs.HcFmNumber++;
BX_OHCI_THIS hub.op_regs.HcFmNumber &= 0xffff;
DEV_MEM_WRITE_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcHCCA + 0x80, 2, (Bit8u *) &BX_OHCI_THIS hub.op_regs.HcFmNumber);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
DEV_MEM_WRITE_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcHCCA + 0x82, 2, (Bit8u *) &zero);
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
if ((BX_OHCI_THIS hub.op_regs.HcFmNumber == 0x8000) || (BX_OHCI_THIS hub.op_regs.HcFmNumber == 0x0000)) {
set_interrupt(OHCI_INTR_FNO);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
//
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
set_interrupt(OHCI_INTR_SF);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// if interrupt delay (done_count) == 0, and status.wdh == 0, then update the donehead fields.
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_DEBUG(("done_count = %i, status.wdh = %i", BX_OHCI_THIS hub.ohci_done_count,
((BX_OHCI_THIS hub.op_regs.HcInterruptStatus & OHCI_INTR_WD) > 0)));
if ((BX_OHCI_THIS hub.ohci_done_count == 0) && ((BX_OHCI_THIS hub.op_regs.HcInterruptStatus & OHCI_INTR_WD) == 0)) {
Bit32u temp = BX_OHCI_THIS hub.op_regs.HcDoneHead;
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
if (BX_OHCI_THIS hub.op_regs.HcInterruptStatus & BX_OHCI_THIS hub.op_regs.HcInterruptEnable)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
temp |= 1;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
BX_DEBUG(("Updating the hcca.DoneHead field to 0x%08X and setting the wdh flag", temp));
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
DEV_MEM_WRITE_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcHCCA + 0x84, 4, (Bit8u *) &temp);
BX_OHCI_THIS hub.op_regs.HcDoneHead = 0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_OHCI_THIS hub.ohci_done_count = 7;
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
set_interrupt(OHCI_INTR_WD);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// if (6 >= done_count > 0) then decrement done_count
if ((BX_OHCI_THIS hub.ohci_done_count != 7) && (BX_OHCI_THIS hub.ohci_done_count > 0))
BX_OHCI_THIS hub.ohci_done_count--;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
// TODO: Rather than just comparing .fr to <8000 here, and <4000 below, see the highlighted
// statement on page 45.
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// if the control list is enabled *and* the control list filled bit is set, do a control list ED
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
if (BX_OHCI_THIS hub.op_regs.HcControl.cle) {
if (BX_OHCI_THIS hub.use_control_head) {
BX_OHCI_THIS hub.op_regs.HcControlCurrentED = 0;
BX_OHCI_THIS hub.use_control_head = 0;
}
if (!BX_OHCI_THIS hub.op_regs.HcControlCurrentED && BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf) {
BX_OHCI_THIS hub.op_regs.HcControlCurrentED = BX_OHCI_THIS hub.op_regs.HcControlHeadED;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.clf = 0;
}
while (BX_OHCI_THIS hub.op_regs.HcControlCurrentED) {
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcControlCurrentED, 4, (Bit8u*) &cur_ed.dword0);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcControlCurrentED + 4, 4, (Bit8u*) &cur_ed.dword1);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcControlCurrentED + 8, 4, (Bit8u*) &cur_ed.dword2);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcControlCurrentED + 12, 4, (Bit8u*) &cur_ed.dword3);
process_ed(&cur_ed, BX_OHCI_THIS hub.op_regs.HcControlCurrentED);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcControlCurrentED = ED_GET_NEXTED(&cur_ed);
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
if (get_frame_remaining() < 8000)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
goto do_bulk_eds;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
do_bulk_eds:
// if the bulk list is enabled *and* the bulk list filled bit is set, do a bulk list ED
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
if (BX_OHCI_THIS hub.op_regs.HcControl.ble) {
if (BX_OHCI_THIS hub.use_bulk_head) {
BX_OHCI_THIS hub.op_regs.HcBulkCurrentED = 0;
BX_OHCI_THIS hub.use_bulk_head = 0;
}
if (!BX_OHCI_THIS hub.op_regs.HcBulkCurrentED && BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf) {
BX_OHCI_THIS hub.op_regs.HcBulkCurrentED = BX_OHCI_THIS hub.op_regs.HcBulkHeadED;
BX_OHCI_THIS hub.op_regs.HcCommandStatus.blf = 0;
}
while (BX_OHCI_THIS hub.op_regs.HcBulkCurrentED) {
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcBulkCurrentED, 4, (Bit8u*) &cur_ed.dword0);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcBulkCurrentED + 4, 4, (Bit8u*) &cur_ed.dword1);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcBulkCurrentED + 8, 4, (Bit8u*) &cur_ed.dword2);
DEV_MEM_READ_PHYSICAL(BX_OHCI_THIS hub.op_regs.HcBulkCurrentED + 12, 4, (Bit8u*) &cur_ed.dword3);
process_ed(&cur_ed, BX_OHCI_THIS hub.op_regs.HcBulkCurrentED);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.op_regs.HcBulkCurrentED = ED_GET_NEXTED(&cur_ed);
- new method get_frame_remaining() calculates register value from the difference between the current time and the "start-of-frame" time - removed 1 usec interval timer - simplified calculation of the PPCM reset value
2009-03-10 02:18:52 +03:00
if (get_frame_remaining() < 4000)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
goto do_iso_eds;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
do_iso_eds:
// do the ED's in the interrupt table
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
if (BX_OHCI_THIS hub.op_regs.HcControl.ple) {
address = BX_OHCI_THIS hub.op_regs.HcHCCA + ((BX_OHCI_THIS hub.op_regs.HcFmNumber & 0x1F) * 4);
DEV_MEM_READ_PHYSICAL(address, 4, (Bit8u*) &ed_address);
while (ed_address) {
DEV_MEM_READ_PHYSICAL(ed_address, 4, (Bit8u*) &cur_ed.dword0);
DEV_MEM_READ_PHYSICAL(ed_address + 4, 4, (Bit8u*) &cur_ed.dword1);
DEV_MEM_READ_PHYSICAL(ed_address + 8, 4, (Bit8u*) &cur_ed.dword2);
DEV_MEM_READ_PHYSICAL(ed_address + 12, 4, (Bit8u*) &cur_ed.dword3);
process_ed(&cur_ed, ed_address);
ed_address = ED_GET_NEXTED(&cur_ed);
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
} // end run schedule
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
void bx_usb_ohci_c::process_ed(struct OHCI_ED *ed, const Bit32u ed_address)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
{
struct OHCI_TD cur_td;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (!ED_GET_H(ed) && !ED_GET_K(ed) && (ED_GET_HEADP(ed) != ED_GET_TAILP(ed))) {
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// if the isochronous is enabled and ed is a isochronous, do TD
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
if (ED_GET_F(ed)) {
if (BX_OHCI_THIS hub.op_regs.HcControl.ie) {
// load and do a isochronous TD list
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
BX_DEBUG(("Found a valid ED that points to an isochronous TD"));
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
// we currently ignore ISO TD's
}
} else {
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
BX_DEBUG(("Found a valid ED that points to an control/bulk/int TD"));
- another bugfix by Ben Lunt
2009-04-01 11:27:34 +04:00
while (ED_GET_HEADP(ed) != ED_GET_TAILP(ed)) {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
DEV_MEM_READ_PHYSICAL(ED_GET_HEADP(ed), 4, (Bit8u*) &cur_td.dword0);
DEV_MEM_READ_PHYSICAL(ED_GET_HEADP(ed) + 4, 4, (Bit8u*) &cur_td.dword1);
DEV_MEM_READ_PHYSICAL(ED_GET_HEADP(ed) + 8, 4, (Bit8u*) &cur_td.dword2);
DEV_MEM_READ_PHYSICAL(ED_GET_HEADP(ed) + 12, 4, (Bit8u*) &cur_td.dword3);
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
BX_DEBUG(("Head: 0x%08X Tail: 0x%08X Next: 0x%08X", ED_GET_HEADP(ed), ED_GET_TAILP(ed), TD_GET_NEXTTD(&cur_td)));
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
if (process_td(&cur_td, ed)) {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
const Bit32u temp = ED_GET_HEADP(ed);
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
if (TD_GET_CC(&cur_td) < NotAccessed) {
ED_SET_HEADP(ed, TD_GET_NEXTTD(&cur_td));
TD_SET_NEXTTD(&cur_td, BX_OHCI_THIS hub.op_regs.HcDoneHead);
BX_OHCI_THIS hub.op_regs.HcDoneHead = temp;
if (TD_GET_DI(&cur_td) < BX_OHCI_THIS hub.ohci_done_count)
BX_OHCI_THIS hub.ohci_done_count = TD_GET_DI(&cur_td);
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
DEV_MEM_WRITE_PHYSICAL(temp, 4, (Bit8u*) &cur_td.dword0);
DEV_MEM_WRITE_PHYSICAL(temp + 4, 4, (Bit8u*) &cur_td.dword1);
DEV_MEM_WRITE_PHYSICAL(temp + 8, 4, (Bit8u*) &cur_td.dword2);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
} else
break;
}
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
DEV_MEM_WRITE_PHYSICAL(ed_address + 8, 4, (Bit8u*) &ed->dword2);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
bx_bool bx_usb_ohci_c::process_td(struct OHCI_TD *td, struct OHCI_ED *ed)
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
{
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
unsigned pid = 0, len = 0, len1, len2;
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
int r, ret = 0;
char buf_str[1025], temp_str[17];
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// The td->cc field should be 111x if it hasn't been processed yet.
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (TD_GET_CC(td) < NotAccessed) {
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
BX_ERROR(("Found TD with CC value not 111x"));
return 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (ED_GET_D(ed) == 1)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
pid = USB_TOKEN_OUT;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
else if (ED_GET_D(ed) == 2)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
pid = USB_TOKEN_IN;
else {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (TD_GET_DP(td) == 0)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
pid = USB_TOKEN_SETUP;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
else if (TD_GET_DP(td) == 1)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
pid = USB_TOKEN_OUT;
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
else if (TD_GET_DP(td) == 2)
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
pid = USB_TOKEN_IN;
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// calculate the length of the packet
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
if (TD_GET_CBP(td) && TD_GET_BE(td)) {
if ((TD_GET_CBP(td) & 0xFFFFF000) != (TD_GET_BE(td) & 0xFFFFF000))
len = (TD_GET_BE(td) & 0xFFF) + 0x1001 - (TD_GET_CBP(td) & 0xFFF);
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
else {
- applied latest version of the USB OHCI support by Ben Lunt (WIN98SE can use the USB mouse now) - minor fixes in the USB common and devices code
2009-02-14 13:06:20 +03:00
len = (TD_GET_BE(td) - TD_GET_CBP(td)) + 1;
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
if (len < 0) len = 0x1001 + len;
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
} else
len = 0;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
BX_OHCI_THIS usb_packet.pid = pid;
BX_OHCI_THIS usb_packet.devaddr = ED_GET_FA(ed);
BX_OHCI_THIS usb_packet.devep = ED_GET_EN(ed);
BX_OHCI_THIS usb_packet.data = BX_OHCI_THIS device_buffer;
switch (pid) {
case USB_TOKEN_SETUP:
case USB_TOKEN_OUT:
BX_OHCI_THIS usb_packet.len = (len <= ED_GET_MPS(ed)) ? len : ED_GET_MPS(ed);
break;
case USB_TOKEN_IN:
BX_OHCI_THIS usb_packet.len = len;
break;
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
BX_DEBUG((" pid = %s addr = %i endpnt = %i len = %i mps = %i (td->cbp = 0x%08X, td->be = 0x%08X)",
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
(pid == USB_TOKEN_IN)? "IN" : (pid == USB_TOKEN_OUT) ? "OUT" : (pid == USB_TOKEN_SETUP) ? "SETUP" : "UNKNOWN",
ED_GET_FA(ed), ED_GET_EN(ed), len, ED_GET_MPS(ed), TD_GET_CBP(td), TD_GET_BE(td)));
BX_DEBUG((" td->t = %i ed->c = %i td->di = %i td->r = %i", TD_GET_T(td), ED_GET_C(ed), TD_GET_DI(td), TD_GET_R(td)));
- the status bar indicators for the USB HCs now show the data transfer
2009-04-06 13:30:26 +04:00
/* set status bar conditions for device */
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
if ((len > 0) && (BX_OHCI_THIS hub.statusbar_id >= 0)) {
- implemented "auto-off" status LED feature and removed old "iolight" code
2011-12-28 18:53:05 +04:00
if (pid == USB_TOKEN_IN)
bx_gui->statusbar_setitem(BX_OHCI_THIS hub.statusbar_id, 1); // read
else
bx_gui->statusbar_setitem(BX_OHCI_THIS hub.statusbar_id, 1, 1); // write
- the status bar indicators for the USB HCs now show the data transfer
2009-04-06 13:30:26 +04:00
}
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
switch (pid) {
case USB_TOKEN_SETUP:
if (len > 0)
improved the fix for busmaster DMA transfers from device to memory done by Volker
2011-12-02 23:41:54 +04:00
DEV_MEM_READ_PHYSICAL_DMA(TD_GET_CBP(td), len, device_buffer);
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
// TODO: This is a hack. dev->handle_packet() should return the amount of bytes
// it received, not the amount it anticipates on receiving/sending in the next packet.
if ((ret = BX_OHCI_THIS broadcast_packet(&BX_OHCI_THIS usb_packet)) >= 0)
ret = 8;
break;
case USB_TOKEN_OUT:
if (len > 0)
improved the fix for busmaster DMA transfers from device to memory done by Volker
2011-12-02 23:41:54 +04:00
DEV_MEM_READ_PHYSICAL_DMA(TD_GET_CBP(td), len, device_buffer);
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
ret = BX_OHCI_THIS broadcast_packet(&BX_OHCI_THIS usb_packet);
break;
case USB_TOKEN_IN:
ret = BX_OHCI_THIS broadcast_packet(&BX_OHCI_THIS usb_packet);
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
if (ret > 0) {
if (((TD_GET_CBP(td) & 0xfff) + ret) > 0x1000) {
len1 = 0x1000 - (TD_GET_CBP(td) & 0xfff);
len2 = ret - len1;
improved the fix for busmaster DMA transfers from device to memory done by Volker
2011-12-02 23:41:54 +04:00
DEV_MEM_WRITE_PHYSICAL_DMA(TD_GET_CBP(td), len1, device_buffer);
DEV_MEM_WRITE_PHYSICAL_DMA((TD_GET_BE(td) & ~0xfff), len2, device_buffer+len1);
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
} else {
improved the fix for busmaster DMA transfers from device to memory done by Volker
2011-12-02 23:41:54 +04:00
DEV_MEM_WRITE_PHYSICAL_DMA(TD_GET_CBP(td), ret, device_buffer);
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
}
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
} else
ret = 0;
break;
default:
TD_SET_CC(td, UnexpectedPID);
TD_SET_EC(td, 3);
return 1;
}
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
// print the buffer used, to the log file
if (ret > 0) {
- fixed debug output (max. 16 hex bytes per line)
2009-03-29 11:56:28 +04:00
BX_DEBUG(("buffer dump (%i bytes)", ret));
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
buf_str[0] = 0;
for (r=0; r<ret; r++) {
sprintf(temp_str, "%02X ", device_buffer[r]);
strcat(buf_str, temp_str);
- fixed debug output (max. 16 hex bytes per line)
2009-03-29 11:56:28 +04:00
if ((r % 16) == 15) {
BX_DEBUG(("%s", buf_str));
buf_str[0] = 0;
}
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
}
- fixed debug output (max. 16 hex bytes per line)
2009-03-29 11:56:28 +04:00
if (strlen(buf_str) > 0) BX_DEBUG(("%s", buf_str));
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- minor bugfixes
2009-04-01 00:05:30 +04:00
if ((ret == (int)len) || ((pid == USB_TOKEN_IN) && (ret >= 0) &&
TD_GET_R(td)) || ((pid == USB_TOKEN_OUT) && (ret >= 0) &&
(ret <= (int) ED_GET_MPS(ed)))) {
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
if (ret == (int)len)
TD_SET_CBP(td, 0);
else {
- fixed crossing of the 4k boundary (USB disk on OHCI now works in Win98SE)
2009-04-29 22:16:31 +04:00
if (((TD_GET_CBP(td) & 0xfff) + ret) >= 0x1000) {
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
TD_SET_CBP(td, (TD_GET_CBP(td) + ret) & 0x0FFF);
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
TD_SET_CBP(td, TD_GET_CBP(td) | (TD_GET_BE(td) & ~0x0FFF));
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
} else {
TD_SET_CBP(td, TD_GET_CBP(td) + ret);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
}
- minor bugfixes
2009-04-01 00:05:30 +04:00
if (TD_GET_T(td) & 2) {
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
TD_SET_T(td, TD_GET_T(td) ^ 1);
- minor bugfixes
2009-04-01 00:05:30 +04:00
ED_SET_C(ed, (TD_GET_T(td) & 1));
} else
ED_SET_C(ed, (ED_GET_C(ed) ^ 1));
- for OUT transfers don't set the completion condition until all data is sent to the device and process TD repeatedly until CC is modified (fixes MSD connected to OHCI with Linux guest) - fixed CBP calculation and split transfer to memory when crossing the 4k boundary (makes 8k transfers work according to the specs: fixes Win98 guest crash) - don't enable the status bar i/o indicator if it's ID is not valid (no space left in status bar) - minor debug message fixes
2009-04-29 02:57:06 +04:00
if ((pid != USB_TOKEN_OUT) || (ret == (int)len)) {
TD_SET_CC(td, NoError);
TD_SET_EC(td, 0);
}
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
} else {
if (ret >= 0)
TD_SET_CC(td, DataUnderrun);
else {
switch (ret) {
case USB_RET_NODEV: // (-1)
TD_SET_CC(td, DeviceNotResponding);
break;
case USB_RET_NAK: // (-2)
TD_SET_CC(td, Stall);
break;
case USB_RET_STALL: // (-3)
TD_SET_CC(td, Stall);
break;
case USB_RET_BABBLE: // (-4)
TD_SET_CC(td, BufferOverrun);
break;
case USB_RET_ASYNC: // (-5)
TD_SET_CC(td, BufferOverrun);
break;
default:
BX_ERROR(("Unknown error returned: %i", ret));
break;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
TD_SET_EC(td, 3);
ED_SET_H(ed, 1);
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
BX_DEBUG((" td->cbp = 0x%08X ret = %i len = %i td->cc = %i td->ec = %i ed->h = %i", TD_GET_CBP(td), ret, len, TD_GET_CC(td), TD_GET_EC(td), ED_GET_H(ed)));
BX_DEBUG((" td->t = %i ed->c = %i", TD_GET_T(td), ED_GET_C(ed)));
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
return 1;
}
int bx_usb_ohci_c::broadcast_packet(USBPacket *p)
{
int i, ret;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
ret = USB_RET_NODEV;
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
for (i = 0; i < BX_N_USB_OHCI_PORTS && ret == USB_RET_NODEV; i++) {
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
if ((BX_OHCI_THIS hub.usb_port[i].device != NULL) &&
(BX_OHCI_THIS hub.usb_port[i].HcRhPortStatus.ccs)) {
ret = BX_OHCI_THIS hub.usb_port[i].device->handle_packet(p);
}
}
return ret;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- implemented new mechanism to update device config parameters that depend on each other. Devices can register a handler to update it's state after runtime configuration. The new method update_runtime_options() executes all registered device handlers before the simulation continues. - USB host controllers now using the new mechanism to handle the runtime device change (replaces the previous timer-based implementation). TODO: floppy and cdrom could use this feature, too) - improved USB device change messages
2011-06-11 23:38:52 +04:00
void bx_usb_ohci_c::runtime_config_handler(void *this_ptr)
{
bx_usb_ohci_c *class_ptr = (bx_usb_ohci_c *) this_ptr;
class_ptr->runtime_config();
}
void bx_usb_ohci_c::runtime_config(void)
{
int i;
char pname[6];
for (i = 0; i < BX_N_USB_OHCI_PORTS; i++) {
// device change support
if ((BX_OHCI_THIS hub.device_change & (1 << i)) != 0) {
BX_INFO(("USB port #%d: device connect", i+1));
sprintf(pname, "port%d", i + 1);
init_device(i, (bx_list_c*)SIM->get_param(pname, SIM->get_param(BXPN_USB_OHCI)));
BX_OHCI_THIS hub.device_change &= ~(1 << i);
}
// forward to connected device
if (BX_OHCI_THIS hub.usb_port[i].device != NULL) {
BX_OHCI_THIS hub.usb_port[i].device->runtime_config();
}
}
}
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
// pci configuration space read callback handler
Bit32u bx_usb_ohci_c::pci_read_handler(Bit8u address, unsigned io_len)
{
Bit32u value = 0;
for (unsigned i=0; i<io_len; i++) {
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
value |= (BX_OHCI_THIS pci_conf[address+i] << (i*8));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
remove very ugly and unsafe code (string functions are evil!) - new code is also 10 times faster.
2009-04-22 23:11:01 +04:00
if (io_len == 1)
- simplified PCI config space write debug messages for the current i/o length - removed full device name from debug messages, since the device is specified by it's prefix. Full name is only required in a BX_INFO() in init(). - removed BX_PANIC messages that will never happen
2009-04-23 19:52:53 +04:00
BX_DEBUG(("read PCI register 0x%02x value 0x%02x", address, value));
remove very ugly and unsafe code (string functions are evil!) - new code is also 10 times faster.
2009-04-22 23:11:01 +04:00
else if (io_len == 2)
- simplified PCI config space write debug messages for the current i/o length - removed full device name from debug messages, since the device is specified by it's prefix. Full name is only required in a BX_INFO() in init(). - removed BX_PANIC messages that will never happen
2009-04-23 19:52:53 +04:00
BX_DEBUG(("read PCI register 0x%02x value 0x%04x", address, value));
remove very ugly and unsafe code (string functions are evil!) - new code is also 10 times faster.
2009-04-22 23:11:01 +04:00
else if (io_len == 4)
- simplified PCI config space write debug messages for the current i/o length - removed full device name from debug messages, since the device is specified by it's prefix. Full name is only required in a BX_INFO() in init(). - removed BX_PANIC messages that will never happen
2009-04-23 19:52:53 +04:00
BX_DEBUG(("read PCI register 0x%02x value 0x%08x", address, value));
remove very ugly and unsafe code (string functions are evil!) - new code is also 10 times faster.
2009-04-22 23:11:01 +04:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
return value;
}
// pci configuration space write callback handler
void bx_usb_ohci_c::pci_write_handler(Bit8u address, Bit32u value, unsigned io_len)
{
Bit8u value8, oldval;
bx_bool baseaddr_change = 0;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (((address >= 0x14) && (address <= 0x34)))
return;
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
for (unsigned i=0; i<io_len; i++) {
value8 = (value >> (i*8)) & 0xFF;
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
oldval = BX_OHCI_THIS pci_conf[address+i];
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
switch (address+i) {
case 0x04:
value8 &= 0x06; // (bit 0 is read only for this card) (we don't allow port IO)
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
BX_OHCI_THIS pci_conf[address+i] = value8;
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
break;
case 0x3d: //
case 0x3e: //
case 0x3f: //
case 0x05: // disallowing write to command hi-byte
case 0x06: // disallowing write to status lo-byte (is that expected?)
break;
case 0x3c:
if (value8 != oldval) {
BX_INFO(("new irq line = %d", value8));
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
BX_OHCI_THIS pci_conf[address+i] = value8;
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
}
break;
case 0x10: // low 12 bits of BAR are R/O
value8 = 0x00;
case 0x11: // low 12 bits of BAR are R/O
value8 &= 0xF0;
case 0x12:
case 0x13:
baseaddr_change |= (value8 != oldval);
default:
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
BX_OHCI_THIS pci_conf[address+i] = value8;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
}
if (baseaddr_change) {
if (DEV_pci_set_base_mem(BX_OHCI_THIS_PTR, read_handler, write_handler,
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
&BX_OHCI_THIS pci_base_address[0],
- moved pci_conf array as a protected member to the PCI device stub class (exists in all PCI devices)
2011-06-23 19:56:02 +04:00
&BX_OHCI_THIS pci_conf[0x10],
- removed a bunch of unnecessary io_len checks
2009-04-21 21:53:29 +04:00
4096)) {
- added pci_base_address array to bx_pci_device_stub_c and use it in most of the PCI devices instead of several base address variables (ne2k still uses base_address for both ISA and PCI)
2011-06-25 16:43:27 +04:00
BX_INFO(("new base address: 0x%04x", BX_OHCI_THIS pci_base_address[0]));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- simplified PCI config space write debug messages for the current i/o length - removed full device name from debug messages, since the device is specified by it's prefix. Full name is only required in a BX_INFO() in init(). - removed BX_PANIC messages that will never happen
2009-04-23 19:52:53 +04:00
if (io_len == 1)
BX_DEBUG(("write PCI register 0x%02x value 0x%02x", address, value));
else if (io_len == 2)
BX_DEBUG(("write PCI register 0x%02x value 0x%04x", address, value));
else if (io_len == 4)
BX_DEBUG(("write PCI register 0x%02x value 0x%08x", address, value));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
void bx_usb_ohci_c::usb_set_connect_status(Bit8u port, int type, bx_bool connected)
{
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
const bx_bool ccs_org = BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.ccs;
const bx_bool pes_org = BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.pes;
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
usb_device_c *device = BX_OHCI_THIS hub.usb_port[port].device;
if (device != NULL) {
if (device->get_type() == type) {
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (connected) {
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.lsda =
- OHCI packet handling code rewritten (Win98 original now detects the mouse) - moved usb_send_msg() to the common USB devices code - simplified USB MSD devices handling
2009-03-01 22:29:36 +03:00
(device->get_speed() == USB_SPEED_LOW);
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.ccs = 1;
- init() method added to the USB device class - new USB device class method get_info() for improved device connect BX_INFOs - USB printer: output file creation failure now causes BX_ERROR and disconnect instead of BX_PANIC (similar to usb_msd) - removed obsolete include statements
2010-12-05 16:09:41 +03:00
if (!device->get_connected()) {
if (!device->init()) {
- prepared USB cdrom support in the usb_set_connect_status() methods - added 2 missing request types in the usb_msd code
2009-03-09 17:44:06 +03:00
usb_set_connect_status(port, type, 0);
- init() method added to the USB device class - new USB device class method get_info() for improved device connect BX_INFOs - USB printer: output file creation failure now causes BX_ERROR and disconnect instead of BX_PANIC (similar to usb_msd) - removed obsolete include statements
2010-12-05 16:09:41 +03:00
BX_ERROR(("port #%d: connect failed", port+1));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
} else {
- init() method added to the USB device class - new USB device class method get_info() for improved device connect BX_INFOs - USB printer: output file creation failure now causes BX_ERROR and disconnect instead of BX_PANIC (similar to usb_msd) - removed obsolete include statements
2010-12-05 16:09:41 +03:00
BX_INFO(("port #%d: connect: %s", port+1, device->get_info()));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
} else { // not connected
- now using Bit32u values instead of structures for some registers - interrupt handling rewritten based on the Qemu implementation - HcRhPortStatus now belongs to the usb_port structure - partial save/restore support
2009-02-24 20:15:27 +03:00
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.ccs = 0;
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.pes = 0;
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.lsda = 0;
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
remove_device(port);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
- small fixes to make devices connected to OHCI work with Linux guests - changed some BX_INFO messages to BX_DEBUG
2009-03-05 20:29:09 +03:00
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.csc |= (ccs_org != BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.ccs);
BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.pesc |= (pes_org != BX_OHCI_THIS hub.usb_port[port].HcRhPortStatus.pes);
- applied current version of the USB OHCI support by Ben Lunt (communication between guest OS and USB device still not working correctly)
2009-02-05 19:53:44 +03:00
// we changed the value of the port, so show it
- add new method remove_device() for device cleanup - some more registers converted from struct to Bit16u / Bit32u - some progress with save/restore support - small interrupt handling rewrite - report misaligned read/write access
2009-02-26 21:43:11 +03:00
set_interrupt(OHCI_INTR_RHSC);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
// USB runtime parameter handler
const char *bx_usb_ohci_c::usb_param_handler(bx_param_string_c *param, int set,
const char *oldval, const char *val, int maxlen)
{
usbdev_type type = USB_DEV_TYPE_NONE;
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
int portnum;
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
if (set) {
- re-implemented USB port options parameter to assign specific options to the connected device. For now this feature is only used by the 'disk' device to specify an alternative redolog filename of some image modes. - added new methods set_option() and timer() to the base class usb_device_c. The timer() method is periodicly called from the HC's frame timer code. - moved runtime device change stuff from the parameter handler to the end of timer() methods of all hubs. This makes sure that all parameters for the device have been set at connect time. TODO: this technique could also be used for the floppy and cdrom media change.
2011-01-16 15:46:48 +03:00
portnum = atoi((param->get_parent())->get_name()+4) - 1;
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
bx_bool empty = ((strlen(val) == 0) || (!strcmp(val, "none")));
- definition of the number of USB ports moved to bochs.h - create config parameters for USB depending of the defined number of ports - removed obsolete comment - bx_param_num_c flag USE_SPIN_CONTROL now available for all config interfaces
2009-03-15 15:54:59 +03:00
if ((portnum >= 0) && (portnum < BX_N_USB_OHCI_PORTS)) {
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
if (empty && BX_OHCI_THIS hub.usb_port[portnum].HcRhPortStatus.ccs) {
- implemented new mechanism to update device config parameters that depend on each other. Devices can register a handler to update it's state after runtime configuration. The new method update_runtime_options() executes all registered device handlers before the simulation continues. - USB host controllers now using the new mechanism to handle the runtime device change (replaces the previous timer-based implementation). TODO: floppy and cdrom could use this feature, too) - improved USB device change messages
2011-06-11 23:38:52 +04:00
BX_INFO(("USB port #%d: device disconnect", portnum+1));
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
if (BX_OHCI_THIS hub.usb_port[portnum].device != NULL) {
type = BX_OHCI_THIS hub.usb_port[portnum].device->get_type();
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
usb_set_connect_status(portnum, type, 0);
- ported packet broadcast mechanism from Qemu (required to support devices connected to an external hub) - accept empty strings for device disconnect in parameter handler
2009-03-06 00:35:00 +03:00
} else if (!empty && !BX_OHCI_THIS hub.usb_port[portnum].HcRhPortStatus.ccs) {
- improved USB configuration with gui - fixed device change flag handling
2011-01-16 20:17:28 +03:00
BX_OHCI_THIS hub.device_change |= (1 << portnum);
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
} else {
- rewrite of the USB runtime configuration code (for textconfig only) * USB runtime options moved to a new dynamic menu * USB host controllers create own submenus in init() * USB runtime parameter handlers simplified * TODO: related changes in the wx and win32dialog code
2009-03-04 21:20:50 +03:00
BX_PANIC(("usb_param_handler called with unexpected parameter '%s'", param->get_name()));
- applied patch for initial USB OHCI support written by Ben Lunt (Win98 detects the controller, connecting devices is not implemented yet)
2009-01-19 20:18:57 +03:00
}
}
return val;
}
#endif // BX_SUPPORT_PCI && BX_SUPPORT_USB_OHCI
Reference in New Issue Copy Permalink