80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Added the IBM 5161 ISA expansion for PC and XT;

Browse Source 
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
2019-09-20 14:02:30 +02:00
parent b06296bbf6
commit 552a87ea3d
524 changed files with 129555 additions and 21862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
src/dma.c
View File

@@ -41,8 +41,13 @@
#include <string.h>
#include <wchar.h>
#include "86box.h"
#ifdef USE_NEW_DYNAREC
#include "cpu_new/cpu.h"
#include "cpu_new/x86.h"
#else
#include "cpu/cpu.h"
#include "cpu/x86.h"
#endif
#include "machine/machine.h"
#include "mca.h"
#include "mem.h"
@@ -61,6 +66,7 @@ static int dma_wp,
static uint8_t dma_m;
static uint8_t dma_stat;
static uint8_t dma_stat_rq;
static uint8_t dma_stat_rq_pc;
static uint8_t dma_command,
dma16_command;
static struct {
@@ -83,6 +89,22 @@ static struct {
static void dma_ps2_run(int channel);
int
dma_get_drq(int channel)
{
return !!(dma_stat_rq_pc & (1 << channel));
}
void
dma_set_drq(int channel, int set)
{
dma_stat_rq_pc &= ~(1 << channel);
if (set)
dma_stat_rq_pc |= (1 << channel);
}
static uint8_t
dma_read(uint16_t addr, void *priv)
{
@@ -111,11 +133,13 @@ dma_read(uint16_t addr, void *priv)
return(temp);
case 8: /*Status register*/
temp = dma_stat & 0xf;
temp = dma_stat_rq_pc & 0xf;
temp <<= 4;
temp |= dma_stat & 0xf;
dma_stat &= ~0xf;
return(temp);
case 0xd:
case 0xd: /*Temporary register*/
return(0);
}
@@ -156,8 +180,18 @@ dma_write(uint16_t addr, uint8_t val, void *priv)
case 8: /*Control register*/
dma_command = val;
if (val & 0x01)
fatal("Memory-to-memory enable\n");
return;
case 9: /*Request register */
channel = (val & 3);
if (val & 4)
dma_stat_rq_pc |= (1 << channel);
else
dma_stat_rq_pc &= ~(1 << channel);
break;
case 0xa: /*Mask*/
if (val & 4)
dma_m |= (1 << (val & 3));
@@ -186,6 +220,11 @@ dma_write(uint16_t addr, uint8_t val, void *priv)
case 0xd: /*Master clear*/
dma_wp = 0;
dma_m |= 0xf;
dma_stat_rq_pc &= ~0x0f;
return;
case 0xe: /*Clear mask*/
dma_m &= 0xf0;
return;
case 0xf: /*Mask write*/
@@ -387,7 +426,8 @@ dma16_read(uint16_t addr, void *priv)
return(temp);
case 8: /*Status register*/
temp = dma_stat >> 4;
temp = (dma_stat_rq_pc & 0xf0);
temp |= dma_stat >> 4;
dma_stat &= ~0xf0;
return(temp);
}
@@ -438,6 +478,14 @@ dma16_write(uint16_t addr, uint8_t val, void *priv)
case 8: /*Control register*/
return;
case 9: /*Request register */
channel = (val & 3) + 4;
if (val & 4)
dma_stat_rq_pc |= (1 << channel);
else
dma_stat_rq_pc &= ~(1 << channel);
break;
case 0xa: /*Mask*/
if (val & 4)
dma_m |= (0x10 << (val & 3));
@@ -466,6 +514,11 @@ dma16_write(uint16_t addr, uint8_t val, void *priv)
case 0xd: /*Master clear*/
dma16_wp = 0;
dma_m |= 0xf0;
dma_stat_rq_pc &= ~0xf0;
return;
case 0xe: /*Clear mask*/
dma_m &= 0x0f;
return;
case 0xf: /*Mask write*/
@@ -557,12 +610,18 @@ dma_reset(void)
dma[c].cb = 0;
dma[c].size = (c & 4) ? 1 : 0;
}
dma_stat = 0x00;
dma_stat_rq = 0x00;
dma_stat_rq_pc = 0x00;
}
void
dma_init(void)
{
dma_reset();
io_sethandler(0x0000, 16,
dma_read,NULL,NULL, dma_write,NULL,NULL, NULL);
io_sethandler(0x0080, 8,
@@ -574,6 +633,8 @@ dma_init(void)
void
dma16_init(void)
{
dma_reset();
io_sethandler(0x00C0, 32,
dma16_read,NULL,NULL, dma16_write,NULL,NULL, NULL);
io_sethandler(0x0088, 8,
@@ -614,6 +675,8 @@ dma_alias_remove_piix(void)
void
ps2_dma_init(void)
{
dma_reset();
io_sethandler(0x0018, 1,
dma_ps2_read,NULL,NULL, dma_ps2_write,NULL,NULL, NULL);
io_sethandler(0x001a, 1,
@@ -659,8 +722,10 @@ dma_channel_read(int channel)
if ((dma_c->mode & 0xC) != 8)
return(DMA_NODATA);
if (!AT)
if (!AT && !channel)
refreshread();
/* if (!AT && channel)
pclog("DMA refresh read on channel %i\n", channel); */
if (! dma_c->size) {
temp = _dma_read(dma_c->ac);
@@ -730,8 +795,10 @@ dma_channel_write(int channel, uint16_t val)
if ((dma_c->mode & 0xC) != 4)
return(DMA_NODATA);
if (!AT)
/* if (!AT)
refreshread();
if (!AT)
pclog("DMA refresh write on channel %i\n", channel); */
if (! dma_c->size) {
_dma_write(dma_c->ac, val & 0xff);