joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-07 18:36:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix typos

Browse Source
This commit is contained in:
RainRat 2024-04-25 20:44:23 -07:00
parent 4df5160747
commit 64777c9f88
22 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
CHANGELOG
View File

@ -69,7 +69,7 @@ Next:
soft or hard resets the IDE devices through the controller. The Linux
kernel uses a soft/hard reset on startup to detect PATA devices and
if it does not see the correct value after reset, it will either ignore
the device or complain about dianostic failure and cautiously talk to
the device or complain about diagnostic failure and cautiously talk to
the primary IDE hard drive while ignoring any ATAPI CD-ROM emulation.
This allows the Linux kernel to boot and see the CD-ROM drive. (joncampbell123).
- IDE: Do not clear registers unnecessarily when finishing IDENTIFY DEVICE.
@ -137,7 +137,7 @@ Next:
(Imported from dosbox-staging/dosbox-staging#3516 authored by weirddan455)
- Fixed built-in COPY command failed to obtain free space when reported DOS
version is set to 7.1 (maron2000)
- Fixed some file extensions in tbe filter list were ignored in the file open
- Fixed some file extensions in the filter list were ignored in the file open
dialogs (maron2000)
- Fixed issue that IMGSWAP command did not work for CD drives. (maron2000)
- Fixed loaded language file unexpectedly changes on launch. (maron2000)
@ -185,7 +185,7 @@ Next:
state table in BIOS has also been added, though at the moment, the tables
are incomplete. (joncampbell123).
- MegaZeux from the MS-DOS days had a 256-color tweakmode that worked on some
popular SVGA chipsets of it's time though on others it does nothing but halve
popular SVGA chipsets of its time though on others it does nothing but halve
the display resolution of text mode. The basic idea is that it makes the VGA
card latch two 4-bit outputs of the VGA text mode into one 8-bit value, thus,
256 colors possible. Add support for this. However I am not sure whether this
@ -492,7 +492,7 @@ Next:
bits for the interleave emulation and can be properly emulated
with the M_EGA renderer. M_CGA2 is still used for the CGA and
MCGA machine types for those modes. The DCGA DOS/V mode has been
carefully made into it's own render mode instead of part of the
carefully made into its own render mode instead of part of the
M_CGA2 case. (joncampbell123).
- Fixed refcount -1 error and abort when multiple floppies are
attached to a floppy drive and the "Swap floppy" mapper shortcut
@ -601,7 +601,7 @@ Next:
stubs to be developed on going forward to emulate the HGC+ and
InColor cards. Note that InColor will require the MCH_HERC case
to generate 64-color EGA-like output going forward even if the
documented stratup state still emulates the MDA-like monochrome
documented startup state still emulates the MDA-like monochrome
attributes. (joncampbell123)
- SDL2: Stop checking for compiler flags that make it an error to
declare variables after statements in a function or any other
@ -728,7 +728,7 @@ Next:
reports events through the interrupt. Added dosbox.conf option
to allow the user to force a report rate, which can be used to
force a lower than normal report rate for games that cannot
proprly handle higher ones. Allow PS/2 mouse emulation, if
properly handle higher ones. Allow PS/2 mouse emulation, if
rate not set by user, to control report rate. (joncampbell123).
- Add code to COMMAND.COM to flush keyboard input before running
the command given by the user, and flush again when the command
@ -1817,7 +1817,7 @@ Next:
on mounted local and overlay drives for non-Windows
platforms by using special file(s). (Wengier)
- Added config option "special operation file prefix"
(in [dos] section) to speciay an alterantive file
(in [dos] section) to specify an alternative file
prefix for DOSBox-X's special operations on mounted
local and overlay drives. (Wengier)
- Added code page 3021 for the MIK character set used
@ -2006,7 +2006,7 @@ Next:
- Mac OS X builds from now on will use an in-tree tool
to replace dylib references in all executable files.
XCode install_name_tool is no longer used, it became
a hypocondriac and is sitting in the corner screaming
a hypochondriac and is sitting in the corner screaming
about link edit data that doesn't fill a __LINKEDIT
segment. It is once again possible to make Mac OS X
ARM releases and to use dylib files from Brew doing
@ -2583,11 +2583,11 @@ Next:
config option "getsysfont" is added which when set
to "false" will disable the font acquisition on
Windows and Linux platforms. (Wengier & nanshiki)
- Implemented support for inputing CJK characters
- Implemented support for inputting CJK characters
on Linux SDL1 builds using Linux system IMEs. Code
imported from SDL-IM-plus by nanshiki and confirmed
to work on Linux/X11 platform by him.
- Added support for inputing Japanese and Korean
- Added support for inputting Japanese and Korean
characters using system input method (IME) using
the default "windib" video driver in Windows SDL1
build (in addition to "directx" driver). (nanshiki)
@ -2749,7 +2749,7 @@ Next:
help will show correctly for these languages). You
can change the DBCS font used by Configuration Tool
interface via fontxdbcs14 config option. (Wengier)
- Added support for inputing DBCS characters using
- Added support for inputting DBCS characters using
system input method (IME) in Windows SDL1 build.
Chinese (Simplified and Traditional) IMEs may work
with the default video setting and a Chinese code
@ -2830,7 +2830,7 @@ Next:
addition of some files/programs, such as additional
4DOS files, text utilities in TEXTUTIL directory
and TITLE command to change window title. Default
value of the %PATH% envonment variable has been
value of the %PATH% environment variable has been
expanded to include these subdirectories, but if
you use a custom path then you may want to include
these directories in your %PATH%. (Wengier)
@ -2884,7 +2884,7 @@ Next:
and command "CONFIG -ln" will show current language
name (if any), or you can use command "CONFIG -ln
<lang_name> -wl <lang_file>" to specify a language
name when writting to a language file. (Wengier)
name when writing to a language file. (Wengier)
- Added special properties to CONFIG command such as
"hostos", "programdir", "workdir", "configdir", and
"userconfigdir" so that commands like "CONFIG -GET
@ -3105,7 +3105,7 @@ Next:
COLOR_CMP. DirectX-based Windows 95 games are now
able to blit in 256-color mode with a transparent
color key value.
- ANSI.SYS emulaion now supports the "Device Status
- ANSI.SYS emulation now supports the "Device Status
Report" escape when asked through code 6 (report
cursor position)
- Fixed RAM mapping bugs related to MDA/CGA/Hercules
@ -3192,7 +3192,7 @@ Next:
video switches) unless the machine type is
EGA or VGA. Those fields do not exist otherwise.
Certain games like Mindscape's "Road Runner" game
require those fields to be zero as part of it's
require those fields to be zero as part of its
Tandy detection routine.
- PCjr mode will omit the reserved graphics RAM
MCB block, and will subtract 16KB from the top
@ -3329,7 +3329,7 @@ Next:
at startup instead of the graphical one. If the
TrueType font (TTF) output is enabled the text-
mode BIOS screen is used automatically. (Wengier)
- Added a simple BIOS Setup Utlity, which will show
- Added a simple BIOS Setup Utility, which will show
a summary of the current system configuration and
allow users to change the date and time. Press Del
key at the BIOS boot screen to enter. (Wengier)
@ -4214,7 +4214,7 @@ Next:
video setting from the command line. Also added a
config option "high intensity blinking" which when
set will display high intensity background colors
instad of blinking foreground text. The menu item
instead of blinking foreground text. The menu item
"Allow 9-pixel wide fonts" is moved from the menu
group "Compatibility" to here. (Wengier)
- Added "Debugging" menu group under "Help" menu, and
@ -4335,7 +4335,7 @@ Next:
pasting from the Windows clipboard. (Wengier)
- The mouse wheel movements will be automatically
converted into up/down arrows by default for the
intergrated DOS now. You can also enable it for
integrated DOS now. You can also enable it for
the guest system from the "Main" menu ("mouse wheel
movements" -> "Enable for guest systems also") or
from the config file. (Wengier)
@ -4427,7 +4427,7 @@ Next:
CGA or EGA emulation modes. (Wengier)
- DOSBox-X will now try to use the internal DOS date
and time (instead of always using the host date and
date) for file modication timestamps. (Wengier)
date) for file modification timestamps. (Wengier)
- Added menu item "Expanded memory (EMS)" under "DOS"
menu to dynamically enable or disable EMS memory
at run-time. You can now also modify EMS memory
@ -4859,7 +4859,7 @@ Next:
It now saves PC-98 FM interrupt state so that reloading
state does not cause hung music;
It is also fixed not to crash when used within a guest
operting system (when the DOS kernel has been shut down
operating system (when the DOS kernel has been shut down
using the BOOT command);
It now supports memory size up to 1GB;
It will save and verify the DOSBox-X version and build.
@ -4948,7 +4948,7 @@ Next:
is Windows 98-style LBA FAT16 or FAT32.
- IMGMOUNT now assumes ISO type by default if the image file
extension is .iso/.cue/.bin/.mdf. No need for "-t iso" in
this case; but (if appliable) it can be overridden by for
this case; but (if applicable) it can be overridden by for
example "-t hdd". (Wengier)
- IMGMOUNT command (no parameters) now lists mounted FAT/ISO
drives and mounted drive numbers, also SUBST command (no
@ -4985,7 +4985,7 @@ Next:
all options as in Unix/Linux platform (Wengier)
- DIR /O & /OG supported in addition to /ON|/OE|/OS|/OD options.
Options such as /-O & /-A can be used to override /O, /A etc if
they are specified in the DIRCMD environment varaible (Wengier)
they are specified in the DIRCMD environment variable (Wengier)
- DIR and VOL commands now display real serial numbers for mounted
local drives (Windows only) and FAT drives (Wengier)
- Fixed SYS command not working properly (Wengier)
@ -5013,7 +5013,7 @@ Next:
- Fixed clip_key_modifier setting not working when it is
set to alt, ctrl or shift in the SDL2 build. (Wengier)
- Sending "Ctrl+Alt+Del" key from the menu will now reset
the system within DOSBox-X when the intergrated DOS or a
the system within DOSBox-X when the integrated DOS or a
real DOS booted from a disk image is active. (Wengier)
- PC speaker output fixed not to timeout and stop rendering
unless the PC speaker output is not emitting anything
@ -5076,7 +5076,7 @@ Next:
loud popping (DC offset) problems with Tandy DAC
sound effects in Prince of Persia. This new behavior
also seems to match real Tandy 1000 hardware according
to video captures of it's audio/video outputs while
to video captures of its audio/video outputs while
playing Prince of Persia on it.
- Tandy/PCjr 3-voice fixed to respond to I/O port 0xC0
regardless of 8-bit or 16-bit I/O (fixes Prince of
@ -5430,7 +5430,7 @@ Next:
sānguózhì), a game with strange and elaborate timing
code, to run without hanging at the second title screen.
- VGA port 3DAh "undefined bits" setting changed to 0x04
to accomodate "Blues Brothers"
to accommodate "Blues Brothers"
- Configuration GUI: If the settings are scrollable,
tabbing between fields will now auto-scroll to the
field and make it visible.
@ -5715,7 +5715,7 @@ Next:
window no longer "freezes" the display in SDL2 builds.
- IDE emulation now minimally emulates PC-98 I/O port
arrangement in PC-98 mode.
- Running a build that draws it's own menus, setting
- Running a build that draws its own menus, setting
output=opengl, and hiding the menus no longer causes
lag redrawing the screen every time the mouse cursor
moves.
@ -5842,7 +5842,7 @@ Next:
- Use a more compatible offset for DOS redirected interrupt
vector. Works around a null pointer bug in the notes dropdown
list of Jack the Ripper.
- Reqrite pop_ev so it can trigger pagefaults again. Fixes
- Rewrite pop_ev so it can trigger pagefaults again. Fixes
Win 3.11.
- Fix uninitialized access to some isoDrive fields. Pause audio
before switching. Use right subunit with multiple CDs on one
@ -6371,7 +6371,7 @@ Next:
the RS-232C port.
- IDE emulation bug fixed that prevented BIOS to IDE
geometry translation when BIOS head count == 255. This
fix also allows Windows 95 to use it's IDE driver with
fix also allows Windows 95 to use its IDE driver with
>= 4GB hard drives instead of running in MS-DOS compatibility
mode.
- Disk image support fixed to allow 4GB or larger hard disk
@ -6387,7 +6387,7 @@ Next:
- Changed MPU-401 reset duration (DOSBox SVN).
0.82.16
- SDL1 support fixed to gracefully handle a case where,
under Windows XP, with a audio device that is not cycling
under Windows XP, with an audio device that is not cycling
any audio DMA, DOSBox-X can hang on shutdown.
- SDL drawn menus now shift and adjust popup menu position
to ensure the popup is entirely within the screen in cases
@ -6550,7 +6550,7 @@ Next:
stable every time you resize or do anything to trigger
window recreation. Resizing the window no longer causes it
to re-center to your screen.
- SDL initializion fixed not to bail out on startup if
- SDL initialization fixed not to bail out on startup if
DOSBox-X is unable to initialize SDL1 CD-ROM support (ccawley2011)
- Segfault fixed (NULL pointer de-reference) that
occurs when running DOSBox SVN on anything older than
@ -6968,7 +6968,7 @@ Next:
This is to prevent dosbox.conf settings from polluting the
available commands at the shell and conflicting with shell and
executable names.
- EGA emulaton fixed to obey Color Plane Enable register in
- EGA emulation fixed to obey Color Plane Enable register in
16-color planar modes.
- Fixed BIOS model byte to report PS/2 model 30 correctly when
machine=mcga, to allow certain DOS games to detect MCGA that way.
@ -7119,7 +7119,7 @@ Next:
only for non-VESA modes. 1024x768 16-color mode works again.
- Fixed user-defined VESA BIOS modes to validate the required video
memory against the available memory on the emulated SVGA hardware.
- VESA BIOS modelist generation moved into it's own function. Modelist
- VESA BIOS modelist generation moved into its own function. Modelist
is regenerated upon editing/deletion of modes.
- VESA BIOS modes added as suggested by hail-to-the-ryzen
- VESA BIOS emulation now allows scriptable editing, deletion, and
@ -7325,7 +7325,7 @@ Next:
- Conditional support for Direct3D (9) output enabled for
MinGW builds, if the MinGW headers are available (yksoft1).
Option is disabled by default.
- Configuration GUI dialog box widened to accomodate buttons
- Configuration GUI dialog box widened to accommodate buttons
that were previously cut off on the right.
- Replace E_Exit() with LOG_MSG() for key codes from the mapper
that a keyboard scan code generator does not recognize. This
@ -8029,7 +8029,7 @@ Next:
- Maximize/restore fullscreen cleanup.
- Removed DDRAW output.
- Fix FAT filesystem driver to clear "success" flag at all failure
return points. This fixes problems where unrecognizeable FAT
return points. This fixes problems where unrecognizable FAT
filesystems are nonetheless presented as a drive letter with
garbled filenames, when IMGMOUNT should have displayed an error
instead.
@ -8232,7 +8232,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Modify movie recording code so that the movies aren't corrupt when
you exit dosbox without stopping the movie.
- Change RGB3x scaler to look more pretty.
- Improve initial register values compatility of the GUS.
- Improve initial register values compatibility of the GUS.
- Added autodetection for Gameblaster. (games can find it now)
- Change render preferences a bit to be more compatible with Windows 7.
- Add DOS fixes to terminate program. (fixes Fortune Teller)
@ -8353,7 +8353,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Fix mixer 16bit direct transfers on bigendian hosts.
0.72
- Fixed unitialized variable in joystick. (Fixes crashes on Vista and
- Fixed uninitialized variable in joystick. (Fixes crashes on Vista and
Mac OS X)
- Some bugfixes and speedups to the 64 bit recompiling core.
- Fixed sign flag on soundblaster dma transfers (Space Quest 6 intro)
@ -8527,7 +8527,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Fixed a bug in the mixer code, that muted the music in certain games.
- Added an assembly fpu core.
- Made the shell more flexible for batch files.
- Check for unaligned memory acces fixes hangups on ARM processors.
- Check for unaligned memory access fixes hangups on ARM processors.
- Some 64 bit fixes.
- Added code to change configuration at runtime.
- Improved ADPCM emulation.
@ -8651,7 +8651,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Added a keymapper.
- Added basic IPX emulation.
- Added cdrom iso support and floppy images support.
- Added the possibity to boot another dos version.
- Added the possibility to boot another dos version.
- Added Serial passthrough support (win32 only).
- Added the possibility to pause dosbox.
- Changed OpenGL so that it is initialized only when used.
@ -8712,7 +8712,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Added another way to switch to protected mode. (Thanks Morten Eriksen!)
- Fixed some odd badly documented behaviour with PSP/DTA
- Added some warnings on opening of readonly files in writemode(DOS default).
- Many shell enhanchements
- Many shell enhancements
- Fixed a win32 specific bug dealing with filenames starting with a "."
- Fixed some bugs with the directory structure: not found/can't save errors
@ -8751,7 +8751,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
0.58
- fixed date and time issues with fcbs
- added more commands to the internal Shell
- corrected config system when a old configfile was used
- corrected config system when an old configfile was used
- fixed cga put and get pixel
- fixed some vga register getting reset to wrong values
- improved support for foreign keyboards
@ -8835,7 +8835,7 @@ https://github.com/joncampbell123/dosbox-x/pull/290
- Rewrote most of the fcb calls to use normal dos calls.
0.55
- fixed the errors/warnings in prefix_66.h and prefix_66_of.h (decimal too large becomming unsigned).
- fixed the errors/warnings in prefix_66.h and prefix_66_of.h (decimal too large becoming unsigned).
- fixed compilation error on FreeBSD when #disable_joystick was defined
- int10_writechar has been updated to move the cursor position.
- changed the basedir routines to use the current working dir instead of argv[0]. This will fix and brake things :)

2
INSTALL.md
View File

@ -36,7 +36,7 @@ You can also easily upgrade DOSBox-X to the new version with the Windows install
Apart from the Windows installers, you can also find portable zip files starting with `dosbox-x-vsbuild-` and `dosbox-x-mingw-win` in the [Releases](https://github.com/joncampbell123/dosbox-x/releases) page as an alternative way to install DOSBox-X. In the zip file you will find `Release` and `Release SDL2` folders, which correspond to SDL1 and SDL2 respectively.
Regarding Joystick support, the *SDL1 builds requires XInput compatible devices*. If your joystick is not Xinput compatible, you may want to try the SDL2 builds or DirectInput to XInput wrappers such as [Xoutput](https://github.com/csutorasa/XOutput) or [Xbox 360 contoller emulator](https://www.x360ce.com/).
Regarding Joystick support, the *SDL1 builds requires XInput compatible devices*. If your joystick is not Xinput compatible, you may want to try the SDL2 builds or DirectInput to XInput wrappers such as [Xoutput](https://github.com/csutorasa/XOutput) or [Xbox 360 controller emulator](https://www.x360ce.com/).
* Windows XP users must use the XP compatible installer with "XP" in the file name, which includes Visual Studio XP builds and the 32-bit MinGW low-end builds. Note that not all features are available in the MinGW low-end builds, currently Slirp support is known to be missing. You also need to install the [DirectX runtime](https://www.microsoft.com/en-us/download/details.aspx?id=8109) or DOSBox-X will complain you're missing `XInput9_1_0.dll`. XP compatible builds works in ReactOS as well, but support is considered experimental.
* Windows Vista users can use the standard (non-XP) installer. While Visual Studio builds work well, MinGW dropped support for XP/Vista, so install the 32-bit low-end builds from the XP compatible installer if you prefer MinGW builds.

2
contrib/windows/installer/dosbox-x.reference.setup.conf
View File

@ -2457,7 +2457,7 @@ ipx = false
# If you have multiple DOSBox-Xes running on the same network,
# this has to be changed for each. AC:DE:48 is an address range reserved for
# private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
# Default setting is 'random' which randomly choses a MAC address.
# Default setting is 'random' which randomly chooses a MAC address.
# backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
# If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
# NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

2
docs/PLANS/Bochs VBE and VirtualBox OMAPI emulation/TODO
View File

@ -6,7 +6,7 @@
in Bochs and VirtualBox
- Add code to emulate or fake other settings you can change through it.
- Add setting in dosbox.conf that allows user to enable/disable this emulation.
The setting should be disabled by default, since this emulation is irrelevent
The setting should be disabled by default, since this emulation is irrelevant
to DOS gaming but potentially useful for running Windows 3.1/95 (because I
can then code up a simple linear framebuffer that uses the interface to do
modesetting!). Don't code the setting as a boolean, code it as a multivalue

18
docs/PLANS/General TODO.txt
View File

@ -57,13 +57,13 @@ Some plans for future DOSBox-X developments
- Instead of statically assigning I/O and memory handlers, all handlers are
initialized to a lookup function.
- The DOSBox motherboard emulator at this point would also maintain it's own
- The DOSBox motherboard emulator at this point would also maintain its own
setup of a system bus hierarchy (system resources and RAM vs forwarding to
the ISA bus, or a PCI-based system that forwards to PCI which can forward
via PCI-ISA bridge to ISA, etc.).
- When the lookup function is called, the function goes through the "slow"
path where it asks the motherboard what function to call, and the
motherboard returns a function pointer according to it's designation of
motherboard returns a function pointer according to its designation of
routing, which is then written into the I/O handler. In other words, once
an I/O port has been accessed, further access is a direct call to the
I/O callback.
@ -81,9 +81,9 @@ Some plans for future DOSBox-X developments
Sound Blaster ISA PnP emulation will no longer emit a warning when
Windows or any DOS program attempts to reprogram the base address.
It would also allow DOS or Windows to change, relocate, enable/disable
PCI resources. The only performance penalty is that everytime a mapping
PCI resources. The only performance penalty is that every time a mapping
changes, the emulator has to invalidate all I/O and memory callbacks
to allow the "slow" path to do it's work again.
to allow the "slow" path to do its work again.
- The reason we don't do bus lookup every time is one of performance.
DOSBox-X already has an array of IO handlers and memory page handlers,
so why not make use of it as a cache for callbacks once the slow path
@ -93,14 +93,14 @@ Some plans for future DOSBox-X developments
* Motherboard & BIOS oriented system construction
- Rather than the one way the DOSBox kernel does it, the user could instead
specify that DOSBox-X emulate a particular motherboard with a particular
BIOS. The code could then construct I/O and memory mangement to emulate
BIOS. The code could then construct I/O and memory management to emulate
the known chipsets on that board.
Example: If instructed to, it would emulate the system board on an old
laptop of mine with a Chips & Tech 386 AT ASIC, or it could emulate an
old AST motherboard and instruct PIC emulation to act like a Unicorn
Microelectronics UM8259A-2. The default of course would carefully
mimic for backwards compatability the DOSBox mainline "motherboard" and
mimic for backwards compatibility the DOSBox mainline "motherboard" and
"bios" configuration.
- Such construction may include (if on original hardware), VGA emulation
@ -110,7 +110,7 @@ Some plans for future DOSBox-X developments
* CD audio
- Refactor the code to ensure we feed out CD audio in a way the guest
can track it's time accurately.
can track its time accurately.
- IDE/ATAPI emulation needs to support the mode select or whatever commands
used by DOS programs to change CD audio volume.
@ -152,7 +152,7 @@ Some plans for future DOSBox-X developments
keyboard and port 0x92 methods well.
- So what exotic method are older demos using the clear the screen anyway?
Can you figure it out? Their failure to clear the screen properly is
causing graphic anomolies during certain parts.
causing graphic anomalies during certain parts.
- Memory and I/O resource management code. Rather than just pick regions
of memory and I/O space, the emulation code should have a way to mark
that such and such region has been taken for e.g. "VGA BIOS" and
@ -164,7 +164,7 @@ Some plans for future DOSBox-X developments
- Peripherals should assign themselves to a bus if possible. Sound Blaster
emulation for example would register itself to the I/O ports on the
ISA bus. Voodoo 3dfx emulation would register itself to the PCI bus.
- Support not just for declaring an ISA bus and it's frequency, but also
- Support not just for declaring an ISA bus and its frequency, but also
for ISA devices that you would declare "attached" to the bus (same with
PCI). Instead of DOSBox's design where peripherals are static and only
one at a time is possible, we would allow you to declare peripherals

2
docs/PLANS/IBM PC ROM BASIC emulation/TODO
View File

@ -4,7 +4,7 @@
- Also use the PC XT to study the various entry points, besides the obvious INT 19h.
How is BASICA.COM triggering it, for example? I noticed a straight INT 19h triggers
it in a way that "SYSTEM" does not work and you cannot return to DOS.
- The Ralph Brown interrupt list vaugely references a whole range of interrupts as
- The Ralph Brown interrupt list vaguely references a whole range of interrupts as
related to ROM BASIC. How are they related? Do you call them? Or are they pointers?
- Add code to DOSBox-X where, given a BIN image of the PC XT's ROM BIOS, it can boot
into ROM BASIC from the DOSBox shell.

2
dosbox-x.reference.conf
View File

@ -1188,7 +1188,7 @@ ipx = false
# If you have multiple DOSBox-Xes running on the same network,
# this has to be changed for each. AC:DE:48 is an address range reserved for
# private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
# Default setting is 'random' which randomly choses a MAC address.
# Default setting is 'random' which randomly chooses a MAC address.
# backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
# If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
# NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

2
dosbox-x.reference.full.conf
View File

@ -2393,7 +2393,7 @@ ipx = false
# If you have multiple DOSBox-Xes running on the same network,
# this has to be changed for each. AC:DE:48 is an address range reserved for
# private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.
# Default setting is 'random' which randomly choses a MAC address.
# Default setting is 'random' which randomly chooses a MAC address.
# backend: The backend (either pcap or slirp is supported) used for the NE2000 Ethernet emulation.
# If set to "auto", then "slirp" is selected when available, otherwise "pcap" is selected when available.
# NE2000 Ethernet emulation will be disabled if no backend is available (or the specified backend if unavailable).

6
src/dos/dev_con.h
View File

@ -1176,7 +1176,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
ClearAnsi();
}
else {
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc",data[count]); /*prob () */
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc",data[count]); /*prob () */
ClearAnsi();
}
break;
@ -1185,7 +1185,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
ansi.pc98rparen = true;
}
else {
LOG(LOG_IOCTL, LOG_NORMAL)("ANSI: unknown char %c after a esc", data[count]); /*prob () */
LOG(LOG_IOCTL, LOG_NORMAL)("ANSI: unknown char %c after an esc", data[count]); /*prob () */
ClearAnsi();
}
break;
@ -1205,7 +1205,7 @@ bool device_CON::Write(const uint8_t * data,uint16_t * size) {
case '7': /* save cursor pos + attr TODO */
case '8': /* restore this TODO */
default:
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc",data[count]); /*prob () */
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc",data[count]); /*prob () */
ClearAnsi();
break;
}

2
src/dos/dos.cpp
View File

@ -3719,7 +3719,7 @@ static Bitu DOS_29Handler(void)
case 'D':/* scrolling DOWN*/
case 'M':/* scrolling UP*/
default:
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after a esc", reg_al); /*prob () */
LOG(LOG_IOCTL,LOG_NORMAL)("ANSI: unknown char %c after an esc", reg_al); /*prob () */
ClearAnsi29h();
break;
}

2
src/dos/dos_programs.cpp
View File

@ -4085,7 +4085,7 @@ restart_int:
}
while ((vol_sectors/sectors_per_cluster) >= (fatlimit - 2u) && sectors_per_cluster < 0x80u) sectors_per_cluster <<= 1;
sbuf[0x0d]=(uint8_t)sectors_per_cluster;
// TODO small floppys have 2 sectors per cluster?
// TODO small floppies have 2 sectors per cluster?
// reserved sectors
host_writew(&sbuf[0x0e],reserved_sectors);
// Number of FATs

2
src/dosbox.cpp
View File

@ -4718,7 +4718,7 @@ void DOSBOX_SetupConfigSections(void) {
"If you have multiple DOSBox-Xes running on the same network,\n"
"this has to be changed for each. AC:DE:48 is an address range reserved for\n"
"private use, so modify the last three number blocks, e.g. AC:DE:48:88:99:AB.\n"
"Default setting is 'random' which randomly choses a MAC address.");
"Default setting is 'random' which randomly chooses a MAC address.");
Pstring->SetBasic(true);
Pstring = secprop->Add_string("backend", Property::Changeable::WhenIdle, "auto");

2
src/gui/menu.cpp
View File

@ -1235,7 +1235,7 @@ bool DOSBoxMenu::nsMenuInit(void) {
item.nsAppendMenu(nsMenu);
}
/* release our handle on the nsMenus. Mac OS X will keep them alive with it's
/* release our handle on the nsMenus. Mac OS X will keep them alive with its
reference until the menu is destroyed at which point all items and submenus
will be automatically destroyed */
for (auto &id : master_list) {

2
src/gui/sdlmain.cpp
View File

@ -3126,7 +3126,7 @@ static void GUI_ShutDown(Section * /*sec*/) {
static void SetPriority(PRIORITY_LEVELS level) {
#if C_SET_PRIORITY
// Do nothing if priorties are not the same and not root, else the highest
// Do nothing if priorities are not the same and not root, else the highest
// priority can not be set as users can only lower priority (not restore it)
if((sdl.priority.focus != sdl.priority.nofocus ) &&

2
src/hardware/adlib.cpp
View File

@ -802,7 +802,7 @@ public:
//if ( passed > 0 ) LOG_MSG( "Delay %d", passed ) ;
// If we passed more than 30 seconds since the last command, we'll restart the the capture
// If we passed more than 30 seconds since the last command, we'll restart the capture
if ( passed > 30000 ) {
CloseFile();
goto skipWrite;

8
src/hardware/imfc.cpp
View File

@ -6,7 +6,7 @@
* Copyright (C) 2017-2020 Loris Chiocca
* - Authored the IBM Music Feature card (IMFC) emulator, as follows:
* - Reverse-engineered the IMF's Z80 ROM and tested against hardware.
* - Used IDA Pro (licensed) to help structure and anonotate the assembly.
* - Used IDA Pro (licensed) to help structure and annotate the assembly.
* - Ported the assembly to C++ (without IDA Pro's assembly-to-C module).
* - Integrated the results into a working DOSBox 0.74.3 patch.
* - Used the GPL v2+ Virtual FB-01 project for FB-01 emulation (below).
@ -17,7 +17,7 @@
*
* Copyright (C) 1997-1999 Jarek Burczynski <s0246@priv4.onet.pl>
* - Authored the YM-2151 emulator in MAME, which is used in the Virtual
* FB-01 project and dervices sources here.
* FB-01 project and devices sources here.
*
* ---
*
@ -604,7 +604,7 @@ struct MidiFlowPath {
// reports from the music card will reflect its programmed state.
uint8_t System_To_MidiOut;
// This is the path from MIDI IN to the sound processor. This path is set
// so that the music card can be controlled by an external MIDI devince.
// so that the music card can be controlled by an external MIDI device.
uint8_t MidiIn_To_SP;
// This is the route from the system to the sound processor. This path
// is set so that the music card can be controlled by the processor. Note:
@ -7133,7 +7133,7 @@ private:
// m_bufferFromMidiInState.setDataAdded();
if (m_bufferFromMidiInState.getIndexForNextWriteByte() ==
m_bufferFromMidiInState.getLastReadByteIndex()) {
// oops... we just wrote into the data that hans't
// oops... we just wrote into the data that hasn't
// already been read :(
resetMidiInBuffersAndPorts();
m_bufferFromMidiInState.setOverflowErrorFlag();

8
src/hardware/vga_draw.cpp
View File

@ -5003,7 +5003,7 @@ void VGA_sof_debug_video_info(void) {
* VGA: Each mode produces 4-bit pixels per dot clock (256-color mode loads 2 4-bit pixels and emits the 8-bit value per every other dot clock).
* Text modes and EGA/VGA 16-color modes produce values 0-15, CGA 4-color 0-3, CGA 2-color and monochrome EGA/MCGA 0-1,
* and 256-color mode 0-15 for each half of the 8-bit pixel value. Note that on EGA/VGA, there's a "color plane enable"
* register that is used to make sure CGA 2-color and monochrone MCGA modes are limited to one bitplane, in fact CGA 2-color
* register that is used to make sure CGA 2-color and monochrome MCGA modes are limited to one bitplane, in fact CGA 2-color
* and MCGA monochrome modes are really just EGA 16-color modes with only one bitplane enabled for display and writing
* and the memory map set up to emulate non-planar video memory like the DOS application expects. CGA 4-color is still one
* bitplane with odd/even mode enabled and a bit that instructs the hardware to latch 2 bits at a time which are then internally
@ -5027,7 +5027,7 @@ void VGA_sof_debug_video_info(void) {
* Tseng ET4000 cards... doing that will instead give you a 320x200 screen that is not pixel doubled and is squeezed on
* the right half of the screen with garbage data on the left half).
*
* Got it? Good. This complexity is why most games written for EGA work pefectly fine on VGA, even if they play with the
* Got it? Good. This complexity is why most games written for EGA work perfectly fine on VGA, even if they play with the
* EGA palette in the Attribute Controller or color plane masks.
*
* NOTES: A good test case for the color plane enable:
@ -6750,7 +6750,7 @@ void VGA_SetupDrawing(Bitu /*val*/) {
hdend += 1;
vdend += 1;
// horitzontal blanking
// horizontal blanking
if (hbend <= (hbstart & hbend_mask)) hbend += hbend_mask + 1;
hbend += hbstart - (hbstart & hbend_mask);
@ -7048,7 +7048,7 @@ void VGA_SetupDrawing(Bitu /*val*/) {
//Seems regular vga only listens to the 9 char pixel mode with character mode enabled
//Base pixel height around vertical totals of modes that have 100 clocks horizontal
//Different sync values gives different scaling of the whole vertical range
//VGA monitor just seems to thighten or widen the whole vertical range
//VGA monitor just seems to tighten or widen the whole vertical range
vga.draw.resizing=false;
vga.draw.has_split=false;

6
src/ints/bios.cpp
View File

@ -4853,7 +4853,7 @@ void PC98_BIOS_FDC_CALL(unsigned int flags) {
FDC_WAIT_TIMER_HACK();
}
/* Prevent reading 1.44MB floppyies using 1.2MB read commands and vice versa.
/* Prevent reading 1.44MB floppies using 1.2MB read commands and vice versa.
* FIXME: It seems MS-DOS 5.0 booted from a HDI image has trouble understanding
* when Drive A: (the first floppy) is a 1.44MB drive or not and fails
* because it only attempts it using 1.2MB format read commands. */
@ -4932,7 +4932,7 @@ void PC98_BIOS_FDC_CALL(unsigned int flags) {
FDC_WAIT_TIMER_HACK();
}
/* Prevent reading 1.44MB floppyies using 1.2MB read commands and vice versa.
/* Prevent reading 1.44MB floppies using 1.2MB read commands and vice versa.
* FIXME: It seems MS-DOS 5.0 booted from a HDI image has trouble understanding
* when Drive A: (the first floppy) is a 1.44MB drive or not and fails
* because it only attempts it using 1.2MB format read commands. */
@ -11486,7 +11486,7 @@ public:
isa_memory_hole_15mb = false;
}
// FIXME: Erm, well this couldv'e been named better. It refers to the amount of conventional memory
// FIXME: Erm, well this could've been named better. It refers to the amount of conventional memory
// made available to the operating system below 1MB, which is usually DOS.
dos_conventional_limit = (unsigned int)section->Get_int("dos mem limit");

4
src/ints/bios_disk.cpp
View File

@ -1129,7 +1129,7 @@ static bool swapping_requested;
void CMOS_SetRegister(Bitu regNr, uint8_t val); //For setting equipment word
/* 2 floppys and 2 harddrives, max */
/* 2 floppies and 2 harddrives, max */
bool imageDiskChange[MAX_DISK_IMAGES]={false};
imageDisk *imageDiskList[MAX_DISK_IMAGES]={NULL};
imageDisk *diskSwap[MAX_SWAPPABLE_DISKS]={NULL};
@ -2385,7 +2385,7 @@ static Bitu INT13_DiskHandler(void) {
CALLBACK_SCF(false);
} break;
case 0x4B: /* Terminate disk emulation or get emulation status */
/* NTS: Windows XP CD-ROM boot requires this call to work or else setup cannot find it's own files. */
/* NTS: Windows XP CD-ROM boot requires this call to work or else setup cannot find its own files. */
if (reg_dl == 0x7F || (INT13_ElTorito_NoEmuDriveNumber != 0 && INT13_ElTorito_NoEmuDriveNumber == reg_dl)) {
if (reg_al <= 1) {
PhysPt p = (SegValue(ds) << 4) + reg_si;

2
src/libs/decoders/mp3_seek_table.cpp
View File

@ -46,7 +46,7 @@
* 4. What happens if this code is updated to use a new fast-seek file
* format, but an old fast-seek file exists?
*
* The seek-table file is versioned (see SEEK_TABLE_IDENTIFIER befow),
* The seek-table file is versioned (see SEEK_TABLE_IDENTIFIER below),
* therefore, if the format and version is updated, then the seek-table
* will be regenerated.

2
src/libs/decoders/mp3_seek_table.h
View File

@ -53,7 +53,7 @@ struct drmp3_seek_point_serial {
// Our private-decoder structure where we hold:
// - a pointer to the working dr_mp3 instance
// - a template vector of seek_points (the serializeable form)
// - a template vector of seek_points (the serializable form)
struct mp3_t {
drmp3* p_dr = nullptr; // the actual drmp3 instance we open, read, and seek within
std::vector<drmp3_seek_point_serial> seek_points_vector = {};

16
src/libs/decoders/opus.c
View File

@ -209,7 +209,7 @@ static opus_int64 RWops_opus_tell(void* stream)
} /* RWops_opus_tell */
// Populate the opus callback object (in perscribed order), with our callback functions.
// Populate the opus callback object (in prescribed order), with our callback functions.
static const OpusFileCallbacks RWops_opus_callbacks =
{
RWops_opus_read,
@ -299,8 +299,8 @@ static __inline__ void output_opus_info(const OggOpusFile* of, const OpusHead* o
/*
* Opus Open
* =========
* - Creates a new opus file object by using our our callback structure for all IO operations.
* - We also intialize and allocate memory for fields in the opus_t decode structure.
* - Creates a new opus file object by using our callback structure for all IO operations.
* - We also initialize and allocate memory for fields in the opus_t decode structure.
* - SDL expects a returns of 1 on success
*/
static Sint32 opus_open(Sound_Sample* sample, const char* ext)
@ -339,7 +339,7 @@ static Sint32 opus_open(Sound_Sample* sample, const char* ext)
&& getenv("SDL_DONT_RESAMPLE") == NULL){
// Opus resamples all inputs to 48kHz. By default (if env-var SDL_DONT_RESAMPLE doesn't exist)
// we resample to the desired rate so the recieving SDL_sound application doesn't have to.
// we resample to the desired rate so the receiving SDL_sound application doesn't have to.
// This avoids breaking applications that don't expect 48kHz audio and also gives us
// quality-control by using the speex resampler, which has a noise floor of -140 dB, which
// is ~40dB lower than the -96dB offered by 16-bit CD-quality audio.
@ -437,7 +437,7 @@ static Uint32 opus_read(Sound_Sample* sample)
const Uint16 requested_output_size = internal->buffer_size / sizeof(opus_int16);
const Uint16 derived_consumption_size = (requested_output_size * d->rate_ratio) + 0.5;
// Three scenarios in order of probabilty:
// Three scenarios in order of probability:
//
// 1. consume: resample (if needed) a chunk from our decoded queue
// sufficient to fill the requested buffer.
@ -445,7 +445,7 @@ static Uint32 opus_read(Sound_Sample* sample)
// If the decoder has hit the end-of-file, drain any
// remaining decoded data before setting the EOF flag.
//
// 2. decode: decode chunks unil our buffer is full or we hit EOF.
// 2. decode: decode chunks until our buffer is full or we hit EOF.
//
// 3. wrap: we've decoded and consumed to edge of our buffer
// so wrap any remaining decoded samples back around.
@ -486,7 +486,7 @@ static Uint32 opus_read(Sound_Sample* sample)
SDL_memcpy(output_buffer, d->buffer + d->consumed, actual_output_size * sizeof(opus_int16));
}
// bump our comsumption count and absolute pcm position
// bump our consumption count and absolute pcm position
d->consumed += actual_consumed_size;
d->of_pcm += actual_consumed_size;
@ -653,7 +653,7 @@ static Sint32 opus_seek(Sound_Sample* sample, const Uint32 ms)
hours, minutes, seconds, desired_pcm));
// reset our sample flags and let the read function re-apply
// sample flags as it hits them from our our offset
// sample flags as it hits them from our offset
if (op_seekable(d->of))
sample->flags = SOUND_SAMPLEFLAG_CANSEEK;