Added the subsystem ID of a Voodoo3 PCI model to make it work with an external

VGABIOS image in Win95/98 guest without hacking. Mention the Voodoo3 model in
the docs.

bochs/.bochsrc

@@ -433,11 +433,12 @@ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
 #=======================================================================
 # VOODOO:
 # This defines the Voodoo Graphics emulation (experimental). Currently
-# supported models are 'voodoo1', 'voodoo2' and 'banshee'. The Voodoo2 support
+# supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The
-# is not yet complete, but almost usable. The Banshee support is under
+# Voodoo2 support is not yet complete, but almost usable. The Banshee and
-# construction, but basicly usable. It requires an external VGA BIOS the vga
+# Voodoo3 support is under construction, but basicly usable. It requires an
-# extension option to be set to 'voodoo'. The gui screen update timing for all
+# external VGA BIOS the vga extension option to be set to 'voodoo'. The gui
-# models is controlled by the related 'vga' options.
+# screen update timing for all models is controlled by the related 'vga'
+# options.
 #
 # Examples:
 #   voodoo: enabled=1, model=voodoo2

bochs/CHANGES

@@ -25,10 +25,11 @@ Changes after 2.6.9 release:
       and multi-threading support (separate FIFO thread).
     - Voodoo2 model now working after some fixes and implementation of the
       CMDFIFO (using FIFO thread) and one of the bitBLT functions.
-    - Added Voodoo Banshee emulation support (still under construction).
+    - Added Voodoo Banshee / Voodoo3 emulation support (still under construction,
+      but basicly usable).
   - Display (general)
-    - Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee adapters
+    - Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee / Voodoo3
-      (reporting plug&play monitor "Bochs Screen").
+      adapters (reporting plug&play monitor "Bochs Screen").
   - USB
     - Now creating separate plugins for each USB device implementation.
   - Networking

bochs/doc/docbook/user/user.dbk

@@ -3835,11 +3835,12 @@ Example:
   voodoo: enabled=1, model=voodoo1
 </screen>
 This defines the Voodoo Graphics emulation (experimental). Currently
-supported models are 'voodoo1', 'voodoo2' and 'banshee'. The Voodoo2 support
+supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'.
-is not yet complete, but almost usable. The Banshee support is under
+The Voodoo2 support is not yet complete, but almost usable. The Banshee /
-construction, but basicly usable. It requires an external VGA BIOS and the vga
+Voodoo3 support is under construction, but basicly usable. It requires an
-extension option to be set to 'voodoo'. The gui screen update timing for all
+external VGA BIOS and the vga extension option to be set to 'voodoo'.
-models is controlled by the related 'vga' options.
+The gui screen update timing for all models is controlled by the related
+'vga' options.
 </para>
 </section>
 

bochs/doc/man/bochsrc.5

@@ -1,5 +1,5 @@
 .\"Document Author:  Timothy R. Butler   -   tbutler@uninetsolutions.com"
-.TH bochsrc 5 "29 Dec 2017" "bochsrc" "The Bochs Project"
+.TH bochsrc 5 "15 Feb 2018" "bochsrc" "The Bochs Project"
 .\"SKIP_SECTION"
 .SH NAME
 bochsrc \- Configuration file for Bochs.
@@ -483,11 +483,12 @@ Examples:
 .TP
 .I "voodoo:"
 This defines the Voodoo Graphics emulation (experimental). Currently
-supported models are 'voodoo1', 'voodoo2' and 'banshee'. The Voodoo2 support
+supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'.
-is not yet complete, but almost usable. The Banshee support is under
+The Voodoo2 support is not yet complete, but almost usable. The Banshee /
-construction, but basicly usable. It requires an external VGA BIOS and the
+Voodoo3 support is under construction, but basicly usable. It requires an
-vga extension option to be set to 'voodoo'. The gui screen update timing
+external VGA BIOS and the vga extension option to be set to 'voodoo'.
-for all models is controlled by the related 'vga' options.
+The gui screen update timing for all models is controlled by the related
+\&'vga' options.
 
 Example:
   voodoo: enabled=1, model=voodoo1

bochs/iodev/display/banshee.cc

@@ -62,9 +62,8 @@
 // - 2D polygon fill
 // - 2D host-to-screen stretching support
 // - 2D chromaKey support
-// - upper 256 CLUT entries
+// - using upper 256 CLUT entries
 // - pixel format conversion not supported in all cases
-// - Voodoo3 support
 
 // FIXME:
 // - Minor issues in all Banshee modes (e.g. forward/back buttons in explorer)
@@ -185,8 +184,7 @@ void bx_banshee_c::reset(unsigned type)
     pci_conf[reset_vals2[i].addr] = reset_vals2[i].val;
   }
   if (s.model == VOODOO_3) {
-    pci_conf[0x2e] = 0x52; // FIXME: this is an AGP subsystem ID - find a
+    pci_conf[0x2e] = 0x36; // Subsystem ID.for a PCI model
-                           // VGABIOS ROM image with the correct value for PCI
   }
   // TODO