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

- USB runtime parameter handling prepared in the device code

Browse Source
This commit is contained in:
Volker Ruppert 2005-11-29 20:46:17 +00:00
parent e753570e1f
commit c227c822b8
3 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/config.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: config.cc,v 1.63 2005-11-27 17:49:58 vruppert Exp $
// $Id: config.cc,v 1.64 2005-11-29 20:46:17 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1078,13 +1078,9 @@ void bx_init_options ()
*par_ser_ptr++ = bx_options.usb[i].Ooption2;
bx_options.usb[i].Oport1->set_group (strdup(group));
bx_options.usb[i].Oport1->set_runtime_param (1);
bx_options.usb[i].Ooption1->set_group (strdup(group));
bx_options.usb[i].Ooption1->set_runtime_param (1);
bx_options.usb[i].Oport2->set_group (strdup(group));
bx_options.usb[i].Oport2->set_runtime_param (1);
bx_options.usb[i].Ooption2->set_group (strdup(group));
bx_options.usb[i].Ooption2->set_runtime_param (1);
}
// add final NULL at the end, and build the menu
*par_ser_ptr = NULL;

36
bochs/iodev/pciusb.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.cc,v 1.28 2005-11-15 17:19:28 vruppert Exp $
// $Id: pciusb.cc,v 1.29 2005-11-29 20:46:17 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -125,6 +125,15 @@ bx_pciusb_c::init(void)
//FIXME: for now, we want a status bar // hub zero, port zero
BX_USB_THIS hub[0].statusbar_id[0] = bx_gui->register_statusitem("USB");
bx_options.usb[0].Oport1->set_handler(usb_param_handler);
bx_options.usb[0].Oport1->set_runtime_param(1);
bx_options.usb[0].Ooption1->set_handler(usb_param_handler);
bx_options.usb[0].Ooption1->set_runtime_param(1);
bx_options.usb[0].Oport2->set_handler(usb_param_handler);
bx_options.usb[0].Oport2->set_runtime_param(1);
bx_options.usb[0].Ooption2->set_handler(usb_param_handler);
bx_options.usb[0].Ooption2->set_runtime_param(1);
//HACK: Turn on debug messages from the start
//BX_USB_THIS setonoff(LOGLEV_DEBUG, ACT_REPORT);
}
@ -1837,4 +1846,29 @@ bx_pciusb_c::flash_stick(Bit8u *packet, Bit16u size, bx_bool out) {
return 1;
}
char *bx_pciusb_c::usb_param_handler(bx_param_string_c *param, int set, char *val, int maxlen)
{
// handler for USB runtime parameters
if (set) {
bx_id id = param->get_id ();
switch (id) {
case BXP_USB1_PORT1:
BX_ERROR(("USB port #1 device change not implemented yet"));
break;
case BXP_USB1_OPTION1:
BX_ERROR(("USB port #1 option change not implemented yet"));
break;
case BXP_USB1_PORT2:
BX_ERROR(("USB port #2 device change not implemented yet"));
break;
case BXP_USB1_OPTION2:
BX_ERROR(("USB port #2 option change not implemented yet"));
break;
default:
BX_PANIC(("usb_param_handler called with unexpected parameter %d", id));
}
}
return val;
}
#endif // BX_SUPPORT_PCI && BX_SUPPORT_PCIUSB

3
bochs/iodev/pciusb.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: pciusb.h,v 1.13 2005-11-07 19:06:05 vruppert Exp $
// $Id: pciusb.h,v 1.14 2005-11-29 20:46:17 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2004 MandrakeSoft S.A.
@ -344,6 +344,7 @@ public:
virtual bx_bool usb_key_enq(Bit8u *scan_code);
virtual bx_bool usb_keyboard_connected();
virtual bx_bool usb_mouse_connected();
static char *usb_param_handler(bx_param_string_c *param, int set, char *val, int maxlen);
private: