Added the IBM 5161 ISA expansion for PC and XT;
Cleaned up the parallel port emulation, added IRQ support, and made enabling/disabling per port; Added the Award 430NX and the Intel Classic/PCI (Alfredo, 420TX); Finished the 586MC1; Added 8087 emulation; Moved Cyrix 6x86'es to the Dev branch; Sanitized/cleaned up memregs.c/h and intel.c/h; Split the chipsets from machines and sanitized Port 92 emulation; Added support for the 15bpp mode to the Compaq ATI 28800; Moved the MR 386DX and 486 machines to the Dev branch; Ported the new dynamic recompiler from PCem, but it remains in Dev branch until after v2.00; Ported the new timer code from PCem; Cleaned up the CPU table of unused stuff and better optimized its structure; Ported the Open-XT and Open-AT from VARCem, the Open-AT is in the Dev branch; Ported the XT MFM controller rewrite and adding of more controllers (incl. two RLL ones), from VARCem; Added the AHA-1540A and the BusTek BT-542B; Moved the Sumo SCSI-AT to the Dev branch; Minor IDE, FDC, and floppy drive code clean-ups; Made NCR 5380/53C400-based cards' BIOS address configurable; Got rid of the legacy romset variable; Unified (video) buffer and buffer32 into one and make the unified buffer 32-bit; Added the Amstead PPC512 per PCem patch by John Elliott; Switched memory mapping granularity from 16k to 4k (less than 1k not possible due to internal pages); Rewrote the CL-GD 54xx blitter, fixes Win-OS/2 on the 54x6 among other thing; Added the Image Manager 1024 and Professional Graphics Controller per PCem patch by John Elliott and work done on VARCem; Added Headland HT-216, GC-205 and Video 7 VGA 1024i emulation based on PCem commit; Implemented the fuction keys for the Toshiba T1000/T1200/T3100 enhancement; Amstrad MegaPC does now works correctly with non-internal graphics card; The SLiRP code no longer casts a packed struct type to a non-packed struct type; The Xi8088 and PB410a no longer hang on 86Box when PS/2 mouse is not present; The S3 Virge on BeOS is no longer broken (was broken by build #1591); OS/2 2.0 build 6.167 now sees key presses again; Xi8088 now work on CGA again; 86F images converted from either the old or new variants of the HxC MFM format now work correctly; Hardware interrupts with a vector of 0xFF are now handled correctly; OPTi 495SX boards no longer incorrectly have 64 MB maximum RAM when 32 MB is correct; Fixed VNC keyboard input bugs; Fixed AT RTC periodic interrupt - Chicago 58s / 73f / 73g / 81 MIDI play no longer hangs with the build's own VTD driver; Fixed mouse polling with internal mice - Amstrad and Olivetti mice now work correctly; Triones ATAPI DMA driver now correctly reads a file at the end of a CD image with a sectors number not divisible by 4; Compaq Portable now works with all graphics cards; Fixed various MDSI Genius bugs; Added segment limit checks and improved page fault checks for several CPU instructions - Memphis 15xx WINSETUP and Chicago 58s WINDISK.CPL no longer issue a GPF, and some S3 drivers that used to have glitches, now work correctly; Further improved the 808x emulation, also fixes the noticably choppy sound when using 808x CPU's, also fixes #355; OS/2 installer no logner locks up on splash screen on PS/2 Model 70 and 80, fixes #400. Fixed several Amstead bugs, GEM no longer crashes on the Amstrad 1640, fixes #391. Ported John Elliott's Amstrad fixes and improvement from PCem, and fixed the default language so it's correctly Engliish, fixes #278, fixes #389. Fixed a minor IDE timing bug, fixes #388. Fixed Toshiba T1000 RAM issues, fixes #379. Fixed EGA/(S)VGA overscan border handling, fixes #378; Got rid of the now long useless IDE channel 2 auto-removal, fixes #370; Fixed the BIOS files used by the AMSTRAD PC1512, fixes #366; Ported the Unicode CD image file name fix from VARCem, fixes #365; Fixed high density floppy disks on the Xi8088, fixes #359; Fixed some bugs in the Hercules emulation, fixes #346, fixes #358; Fixed the SCSI hard disk mode sense pages, fixes #356; Removed the AMI Unknown 386SX because of impossibility to identify the chipset, closes #349; Fixed bugs in the serial mouse emulation, fixes #344; Compiled 86Box binaries now include all the required .DLL's, fixes #341; Made some combo boxes in the Settings dialog slightly wider, fixes #276.
This commit is contained in:
OBattler
92
src/io.c
92
src/io.c
@@ -8,14 +8,14 @@
|
||||
*
|
||||
* Implement I/O ports and their operations.
|
||||
*
|
||||
* Version: @(#)io.c 1.0.5 2018/10/17
|
||||
* Version: @(#)io.c 1.0.6 2019/03/21
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
* Fred N. van Kempen, <decwiz@yahoo.com>
|
||||
*
|
||||
* Copyright 2008-2018 Sarah Walker.
|
||||
* Copyright 2016-2018 Miran Grca.
|
||||
* Copyright 2008-2019 Sarah Walker.
|
||||
* Copyright 2016-2019 Miran Grca.
|
||||
*/
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
@@ -27,6 +27,7 @@
|
||||
#include "86box.h"
|
||||
#include "io.h"
|
||||
#include "cpu/cpu.h"
|
||||
#include "machine/m_amstrad.h"
|
||||
|
||||
|
||||
#define NPORTS 65536 /* PC/AT supports 64K ports */
|
||||
@@ -208,6 +209,23 @@ io_removehandler(uint16_t base, int size,
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
io_handler(int set, uint16_t base, int size,
|
||||
uint8_t (*inb)(uint16_t addr, void *priv),
|
||||
uint16_t (*inw)(uint16_t addr, void *priv),
|
||||
uint32_t (*inl)(uint16_t addr, void *priv),
|
||||
void (*outb)(uint16_t addr, uint8_t val, void *priv),
|
||||
void (*outw)(uint16_t addr, uint16_t val, void *priv),
|
||||
void (*outl)(uint16_t addr, uint32_t val, void *priv),
|
||||
void *priv)
|
||||
{
|
||||
if (set)
|
||||
io_sethandler(base, size, inb, inw, inl, outb, outw, outl, priv);
|
||||
else
|
||||
io_removehandler(base, size, inb, inw, inl, outb, outw, outl, priv);
|
||||
}
|
||||
|
||||
|
||||
#ifdef PC98
|
||||
void
|
||||
io_sethandler_interleaved(uint16_t base, int size,
|
||||
@@ -288,24 +306,39 @@ io_removehandler_interleaved(uint16_t base, int size,
|
||||
uint8_t
|
||||
inb(uint16_t port)
|
||||
{
|
||||
uint8_t r = 0xff;
|
||||
uint8_t ret = 0xff;
|
||||
io_t *p;
|
||||
int found = 0;
|
||||
|
||||
p = io[port];
|
||||
if (p) {
|
||||
while(p) {
|
||||
if (p->inb)
|
||||
r &= p->inb(port, p->priv);
|
||||
if (p->inb) {
|
||||
ret &= p->inb(port, p->priv);
|
||||
found++;
|
||||
}
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
|
||||
if (port & 0x80)
|
||||
amstrad_latch = AMSTRAD_NOLATCH;
|
||||
else if (port & 0x4000)
|
||||
amstrad_latch = AMSTRAD_SW10;
|
||||
else
|
||||
amstrad_latch = AMSTRAD_SW9;
|
||||
|
||||
#ifdef ENABLE_IO_LOG
|
||||
if (CS == IO_TRACE)
|
||||
io_log("IOTRACE(%04X): inb(%04x)=%02x\n", IO_TRACE, port, r);
|
||||
#endif
|
||||
|
||||
return(r);
|
||||
if (!found)
|
||||
sub_cycles(io_delay);
|
||||
|
||||
// pclog("[%04X:%08X] inb(%04X) = %02X\n", CS, cpu_state.pc, port, ret);
|
||||
|
||||
return(ret);
|
||||
}
|
||||
|
||||
|
||||
@@ -313,12 +346,15 @@ void
|
||||
outb(uint16_t port, uint8_t val)
|
||||
{
|
||||
io_t *p;
|
||||
int found = 0;
|
||||
|
||||
if (io[port]) {
|
||||
p = io[port];
|
||||
while(p) {
|
||||
if (p->outb)
|
||||
if (p->outb) {
|
||||
p->outb(port, val, p->priv);
|
||||
found++;
|
||||
}
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
@@ -327,6 +363,12 @@ outb(uint16_t port, uint8_t val)
|
||||
if (CS == IO_TRACE)
|
||||
io_log("IOTRACE(%04X): outb(%04x,%02x)\n", IO_TRACE, port, val);
|
||||
#endif
|
||||
|
||||
if (!found)
|
||||
sub_cycles(io_delay);
|
||||
|
||||
// pclog("[%04X:%08X] outb(%04X) = %02X\n", CS, cpu_state.pc, port, val);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -335,17 +377,26 @@ uint16_t
|
||||
inw(uint16_t port)
|
||||
{
|
||||
io_t *p;
|
||||
uint16_t ret = 0xffff;
|
||||
int found = 0;
|
||||
|
||||
p = io[port];
|
||||
if (p) {
|
||||
while(p) {
|
||||
if (p->inw)
|
||||
return p->inw(port, p->priv);
|
||||
if (p->inw) {
|
||||
ret = p->inw(port, p->priv);
|
||||
found = 1;
|
||||
}
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
|
||||
return(inb(port) | (inb(port + 1) << 8));
|
||||
if (!found)
|
||||
ret = (inb(port) | (inb(port + 1) << 8));
|
||||
// else
|
||||
// pclog("[%04X:%08X] inw(%04X) = %04X\n", CS, cpu_state.pc, port, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -359,6 +410,8 @@ outw(uint16_t port, uint16_t val)
|
||||
while(p) {
|
||||
if (p->outw) {
|
||||
p->outw(port, val, p->priv);
|
||||
|
||||
// pclog("[%04X:%08X] outw(%04X) = %04X\n", CS, cpu_state.pc, port, val);
|
||||
return;
|
||||
}
|
||||
p = p->next;
|
||||
@@ -376,17 +429,26 @@ uint32_t
|
||||
inl(uint16_t port)
|
||||
{
|
||||
io_t *p;
|
||||
uint32_t ret = 0xffffffff;
|
||||
int found = 0;
|
||||
|
||||
p = io[port];
|
||||
if (p) {
|
||||
while(p) {
|
||||
if (p->inl)
|
||||
return p->inl(port, p->priv);
|
||||
if (p->inl) {
|
||||
ret = p->inl(port, p->priv);
|
||||
found = 1;
|
||||
}
|
||||
p = p->next;
|
||||
}
|
||||
}
|
||||
|
||||
return(inw(port) | (inw(port + 2) << 16));
|
||||
if (!found)
|
||||
ret = (inw(port) | (inw(port + 2) << 16));
|
||||
// else
|
||||
// pclog("[%04X:%08X] inl(%04X) = %08X\n", CS, cpu_state.pc, port, ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -400,6 +462,8 @@ outl(uint16_t port, uint32_t val)
|
||||
while(p) {
|
||||
if (p->outl) {
|
||||
p->outl(port, val, p->priv);
|
||||
|
||||
// pclog("[%04X:%08X] outl(%04X) = %08X\n", CS, cpu_state.pc, port, val);
|
||||
return;
|
||||
}
|
||||
p = p->next;
|
||||
|
||||
Reference in New Issue
Block a user