diff --git a/bochs/.bochsrc b/bochs/.bochsrc index a70252c1c..9925e14f4 100644 --- a/bochs/.bochsrc +++ b/bochs/.bochsrc @@ -569,7 +569,7 @@ keyboard_serial_delay: 250 keyboard_paste_delay: 100000 #======================================================================= -# MOUSE: +# MOUSE: # The Bochs gui creates mouse "events" unless the 'enabled' option is # set to 0. The hardware emulation itself is not disabled by this. # Unless you have a particular reason for enabling the mouse by default, @@ -580,7 +580,7 @@ keyboard_paste_delay: 100000 # The default value is 'ps2'. The other choices are 'imps2' (wheel mouse # on PS/2), 'serial', 'serial_wheel' and 'serial_msys' (one com port requires # setting 'mode=mouse'). To connect a mouse to an USB port, see the 'usb_uhci' -# option (requires PCI and USB support). +# or 'usb_ohci' option (requires PCI and USB support). # # Examples: # mouse: enabled=1 @@ -622,7 +622,8 @@ private_colormap: enabled=0 # ne2k: ioaddr=IOADDR, irq=IRQ, mac=MACADDR, ethmod=MODULE, ethdev=DEVICE, script=SCRIPT # # ioaddr, irq: You probably won't need to change ioaddr and irq, unless there -# are IRQ conflicts. +# are IRQ conflicts. These arguments are ignored when assign the ne2k to a +# PCI slot. # # mac: The MAC address MUST NOT match the address of any machine on the net. # Also, the first byte must be an even number (bit 0 set means a multicast @@ -665,6 +666,17 @@ private_colormap: enabled=0 # ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:01, ethmod=vde, ethdev="/tmp/vde.ctl" # ne2k: ioaddr=0x300, irq=9, mac=b0:c4:20:00:00:01, ethmod=vnet, ethdev="c:/temp" +#======================================================================= +# pnic: Bochs/Etherboot pseudo-NIC +# +# Example: +# pnic: enabled=1, mac=MACADDR, ethmod=MODULE, ethdev=DEVICE, script=SCRIPT +# +# The pseudo-NIC accepts the same syntax and supports the same networking +# modules as the NE2000 adapter. It must be assigned to a PCI slot. +#======================================================================= +#pnic: enabled=1, mac=b0:c4:20:00:00:00, ethmod=vnet + #======================================================================= # KEYBOARD_MAPPING: # This enables a remap of a physical localized keyboard to a @@ -720,14 +732,16 @@ i440fxsupport: enabled=1 # USB_UHCI: # This option controls the presence of the USB root hub which is a part # of the i440FX PCI chipset. With the portX option you can connect devices -# to the hub (currently supported: 'mouse', 'tablet', 'keypad', 'disk' and -# 'hub'). +# to the hub (currently supported: 'mouse', 'tablet', 'keypad', 'disk', 'cdrom' +# and 'hub'). # If you connect the mouse or tablet to one of the ports, Bochs forwards the # mouse movement data to the USB device instead of the selected mouse type. # When connecting the keypad to one of the ports, Bochs forwards the input of # the numeric keypad to the USB device instead of the PS/2 keyboard. # To connect a flat image as an USB hardisk you can use the 'disk' device with -# the path to the image separated with a colon (see below). +# the path to the image separated with a colon (see below). To emulate an USB +# cdrom you can use the 'cdrom' device name and the path to an ISO image or raw +# device name also separated with a colon. # The device name 'hub' connects an external hub with max. 8 ports (default: 4) # to the root hub. To specify the number of ports you have to add the value # separated with a colon. Connecting devices to the external hub ports is only @@ -735,7 +749,15 @@ i440fxsupport: enabled=1 #======================================================================= #usb_uhci: enabled=1 #usb_uhci: enabled=1, port1=mouse, port2=disk:usbdisk.img -#usb_uhci: enabled=1, port1=hub:7 +#usb_uhci: enabled=1, port1=hub:7, port2=cdrom:image.iso + +#======================================================================= +# USB_OHCI: +# This option controls the presence of the USB OHCI host controller with a +# 2-port hub. The portX option accepts the same device types with the same +# syntax as the UHCI controller (see above). +#======================================================================= +#usb_ohci: enabled=1 #======================================================================= # CMOSIMAGE: diff --git a/bochs/config.cc b/bochs/config.cc index cae1623ed..c94ed7d90 100755 --- a/bochs/config.cc +++ b/bochs/config.cc @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: config.cc,v 1.173 2009-03-29 20:48:17 vruppert Exp $ +// $Id: config.cc,v 1.174 2009-04-13 16:07:02 vruppert Exp $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. @@ -3032,10 +3032,6 @@ static int parse_line_formatted(const char *context, int num_params, char *param for (i=1; i