Continued release preparations:

- Using bochsrc option "load32bitOSImage" now causes a warning. It is not
  maintained yet, not documented and we don't whether it is used or not.
  I guess it was designed to boot a real 32-bit guest OS when the Bochs BIOS
  wasn't able to do it.
- Added config option --enable-busmouse to all shortcut scripts. We have two
  usable models present now (tested with Win95).
This commit is contained in:
Volker Ruppert 2017-03-24 18:23:07 +00:00
parent f1e90c93b1
commit bc1b1d4ed5
7 changed files with 8 additions and 0 deletions

View File

@ -1214,6 +1214,7 @@ speaker: enabled=1, mode=sound
#======================================================================= #=======================================================================
# other stuff # other stuff
#======================================================================= #=======================================================================
# WARNING: This Bochs feature is not maintained yet. Is it still used ?
#load32bitOSImage: os=nullkernel, path=../kernel.img, iolog=../vga_io.log #load32bitOSImage: os=nullkernel, path=../kernel.img, iolog=../vga_io.log
#load32bitOSImage: os=linux, path=../linux.img, iolog=../vga_io.log, initrd=../initrd.img #load32bitOSImage: os=linux, path=../linux.img, iolog=../vga_io.log, initrd=../initrd.img

View File

@ -39,6 +39,7 @@ case $which_config in
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-show-ips \ --enable-show-ips \
@ -63,6 +64,7 @@ case $which_config in
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-plugins \ --enable-plugins \

View File

@ -31,6 +31,7 @@ export CXXFLAGS
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-plugins \ --enable-plugins \

View File

@ -33,6 +33,7 @@ export LDFLAGS
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-plugins \ --enable-plugins \

View File

@ -28,6 +28,7 @@ export CXXFLAGS
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-show-ips \ --enable-show-ips \

View File

@ -16,6 +16,7 @@ set echo
--enable-usb-ohci \ --enable-usb-ohci \
--enable-usb-ehci \ --enable-usb-ehci \
--enable-usb-xhci \ --enable-usb-xhci \
--enable-busmouse \
--enable-es1370 \ --enable-es1370 \
--enable-e1000 \ --enable-e1000 \
--enable-show-ips \ --enable-show-ips \

View File

@ -3014,6 +3014,7 @@ static int parse_line_formatted(const char *context, int num_params, char *param
} }
SIM->get_param_string(BXPN_LOAD32BITOS_INITRD)->set(&params[4][7]); SIM->get_param_string(BXPN_LOAD32BITOS_INITRD)->set(&params[4][7]);
} }
PARSE_WARN(("%s: WARNING: This Bochs feature is not maintained yet", context));
} else if (!strcmp(params[0], "user_plugin")) { } else if (!strcmp(params[0], "user_plugin")) {
#if BX_PLUGINS #if BX_PLUGINS
char tmpname[80]; char tmpname[80];