[prev in list] [next in list] [prev in thread] [next in thread]
List: bochs-cvs
Subject: [Bochs-cvs] [13500] trunk/bochs
From: vruppert--- via Bochs-cvs <bochs-cvs () lists ! sourceforge ! net>
Date: 2018-05-03 19:46:21
Message-ID: 1525376781.413984.5058 () sfp-scm-6 ! v30 ! lw ! sourceforge ! com
[Download RAW message or body]
Revision: 13500
Author: vruppert
Date: 2018-05-03 19:46:12 +0000 (Thu, 03 May 2018)
Log Message:
-----------
Fixed Banshee status reading via MMIO (unaligned access is allowed).
The Banshee AGP model is now basicly working (tested with Win98SE).
Started documentation updates about i440BX chipset and Banshee AGP.
Modified Paths:
--------------
trunk/bochs/.bochsrc
trunk/bochs/CHANGES
trunk/bochs/iodev/devices.txt
trunk/bochs/iodev/display/banshee.cc
trunk/bochs/main.cc
Modified: trunk/bochs/.bochsrc
===================================================================
--- trunk/bochs/.bochsrc 2018-05-03 17:55:17 UTC (rev 13499)
+++ trunk/bochs/.bochsrc 2018-05-03 19:46:12 UTC (rev 13500)
@@ -435,9 +435,10 @@
# This defines the Voodoo Graphics emulation (experimental). Currently
# supported models are 'voodoo1', 'voodoo2', 'banshee' and 'voodoo3'. The
# Voodoo2 support is not yet complete, but almost usable. The Banshee and
-# Voodoo3 support is under construction, but basicly usable. It requires an
-# external VGA BIOS the vga extension option to be set to 'voodoo'. The gui
-# screen update timing for all models is controlled by the related 'vga'
+# Voodoo3 support is under construction, but basicly usable. The 2D/3D cards
+# require an external VGA BIOS the vga extension option to be set to 'voodoo'.
+# If the i440BX PCI chipset is selected, they can be assigned to AGP (slot #5).
+# The gui screen update timing for all models is controlled by the related 'vga'
# options.
#
# Examples:
@@ -526,13 +527,15 @@
#=======================================================================
# PCI:
-# This option controls the presence of a PCI chipset in Bochs. Currently it only
-# supports the i430FX and i440FX chipsets. You can also specify the devices
-# connected to PCI slots. Up to 5 slots are available. For these combined PCI/ISA
-# devices assigning to slot is mandatory if you want to emulate the PCI model:
-# cirrus, ne2k and pcivga. These PCI-only devices are also supported, but they
-# are auto-assigned if you don't use the slot configuration: e1000, es1370,
-# pcidev, pcipnic, usb_ehci, usb_ohci, usb_xhci and voodoo.
+# This option controls the presence of a PCI chipset in Bochs. Currently it
+# supports the i430FX, i440FX and i440BX chipsets. You can also specify the
+# devices connected to PCI slots. Up to 5 slots are available. For these
+# combined PCI/ISA devices assigning to slot is mandatory if you want to emulate
+# the PCI model: cirrus, ne2k and pcivga. These PCI-only devices are also
+# supported, but they are auto-assigned if you don't use the slot configuration:
+# e1000, es1370, pcidev, pcipnic, usb_ehci, usb_ohci, usb_xhci and voodoo.
+# In case of the i440BX chipset, slot #5 is the AGP slot. Currently only the
+# 'voodoo' device can be assigned to AGP.
#
# Example:
# pci: enabled=1, chipset=i440fx, slot1=pcivga, slot2=ne2k
Modified: trunk/bochs/CHANGES
===================================================================
--- trunk/bochs/CHANGES 2018-05-03 17:55:17 UTC (rev 13499)
+++ trunk/bochs/CHANGES 2018-05-03 19:46:12 UTC (rev 13500)
@@ -18,6 +18,8 @@
added more symbol lookups.
- I/O Devices
+ - PCI
+ Added basic support for the i440BX PCI/AGP chipset.
- Timers
- Implemented HPET emulation (ported from Qemu).
- Voodoo
@@ -26,7 +28,7 @@
- Voodoo2 model now working after some fixes and implementation of the
CMDFIFO (using FIFO thread) and one of the bitBLT functions.
- Added Voodoo Banshee / Voodoo3 emulation support (still under construction,
- but basicly usable).
+ but basicly usable). The AGP models are available if chipset is i440BX.
- Display (general)
- Added basic DDC support for Bochs VBE, Cirrus and Voodoo Banshee / Voodoo3
adapters (reporting plug&play monitor "Bochs Screen").
Modified: trunk/bochs/iodev/devices.txt
===================================================================
--- trunk/bochs/iodev/devices.txt 2018-05-03 17:55:17 UTC (rev 13499)
+++ trunk/bochs/iodev/devices.txt 2018-05-03 19:46:12 UTC (rev 13500)
@@ -2,11 +2,11 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
-MOTHER BOARD (i440FX support) devices.cc
+MOTHER BOARD (i430FX / i440FX / i440BX support) devices.cc
|
- +---- 82441FX (PMC) and 82442 (DBX) emulation pci.cc
+ +---- Host bridge 82430FX / 82441FX / 82443BX pci.cc
|
- +---- 82371SB (PIIX3) PCI ISA IDE XCELERATOR
+ +---- PIIX/PIIX3/PIIX4 (ISA / IDE / USB / ACPI)
| |
| +---- PCI-to-ISA bridge pci2isa.cc
| +---- PCI IDE controller pci_ide.cc
@@ -73,8 +73,9 @@
| | +- Cirrus Logic PCI/ISA CLGD5446 SVGA adapter svga_cirrus.cc
| | +- 3dfx Voodoo Banshee / Voodoo3 adapter banshee.cc
| |
- | +---- 3dfx Voodoo Graphics adapter (SST-1/2) voodoo.cc
+ | +---- 3dfx Voodoo Graphics adapter (4 models) voodoo.cc
| |
+ | |
| +---- VESA DDC support (plug&play monitor) ddc.cc
|
+---- Network support network/
@@ -123,7 +124,7 @@
| |
| +---- USB EHCI adapter usb_ehci.cc
| +---- USB OHCI adapter usb_ohci.cc
- | +---- USB UHCI adapter (PIIX3) usb_uhci.cc
+ | +---- USB UHCI adapter (PIIX3/PIIX4) usb_uhci.cc
| +---- USB xHCI adapter usb_xhci.cc
|
+---- Attached USB devices
Modified: trunk/bochs/iodev/display/banshee.cc
===================================================================
--- trunk/bochs/iodev/display/banshee.cc 2018-05-03 17:55:17 UTC (rev 13499)
+++ trunk/bochs/iodev/display/banshee.cc 2018-05-03 19:46:12 UTC (rev 13500)
@@ -507,7 +507,7 @@
Bit8u reg = (offset>>2);
switch (reg) {
case io_status:
- result = register_r(0);
+ result = register_r(0) >> ((offset & 3) * 8);
break;
case io_dacData:
Modified: trunk/bochs/main.cc
===================================================================
--- trunk/bochs/main.cc 2018-05-03 17:55:17 UTC (rev 13499)
+++ trunk/bochs/main.cc 2018-05-03 19:46:12 UTC (rev 13500)
@@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
-// Copyright (C) 2001-2017 The Bochs Project
+// Copyright (C) 2001-2018 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@ -1247,7 +1247,7 @@
BX_INFO((" Fast function calls: %s", BX_FAST_FUNC_CALL?"yes":"no"));
BX_INFO((" Handlers Chaining speedups: %s", BX_SUPPORT_HANDLERS_CHAINING_SPEEDUPS?"yes":"no"));
BX_INFO(("Devices configuration"));
- BX_INFO((" PCI support: %s", BX_SUPPORT_PCI?"i440FX i430FX":"no"));
+ BX_INFO((" PCI support: %s", BX_SUPPORT_PCI?"i440FX i430FX i440BX":"no"));
#if BX_SUPPORT_NE2K || BX_SUPPORT_E1000
BX_INFO((" Networking support:%s%s",
BX_SUPPORT_NE2K?" NE2000":"", BX_SUPPORT_E1000?" E1000":""));
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Bochs-cvs mailing list
Bochs-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bochs-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic