claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki 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

32
src/video/vid_herculesplus.c
View File

@@ -24,10 +24,10 @@
#include "../86box.h"
#include "../io.h"
#include "../lpt.h"
#include "../timer.h"
#include "../pit.h"
#include "../mem.h"
#include "../rom.h"
#include "../timer.h"
#include "../device.h"
#include "video.h"
#include "vid_herculesplus.h"
@@ -71,8 +71,8 @@ typedef struct {
uint8_t ctrl, ctrl2, stat;
int64_t dispontime, dispofftime;
int64_t vidtime;
uint64_t dispontime, dispofftime;
pc_timer_t timer;
int firstline, lastline;
@@ -81,7 +81,7 @@ typedef struct {
uint16_t ma, maback;
int con, coff, cursoron;
int dispon, blink;
int64_t vsynctime;
int vsynctime;
int vadj;
int cols[256][2][2];
@@ -101,11 +101,11 @@ recalc_timings(herculesplus_t *dev)
disptime = dev->crtc[0] + 1;
_dispontime = dev->crtc[1];
_dispofftime = disptime - _dispontime;
_dispontime *= MDACONST;
_dispofftime *= MDACONST;
_dispontime *= HERCCONST;
_dispofftime *= HERCCONST;
dev->dispontime = (int64_t)(_dispontime * (1 << TIMER_SHIFT));
dev->dispofftime = (int64_t)(_dispofftime * (1 << TIMER_SHIFT));
dev->dispontime = (uint64_t)(_dispontime);
dev->dispofftime = (uint64_t)(_dispofftime);
}
@@ -257,7 +257,7 @@ draw_char_rom(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
}
for (i = 0; i < cw; i++) {
buffer->line[dev->displine][x * cw + i] = (val & 0x100) ? ifg : ibg;
buffer32->line[dev->displine][x * cw + i] = (val & 0x100) ? ifg : ibg;
val = val << 1;
}
}
@@ -320,7 +320,7 @@ draw_char_ram4(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
if ((attr & 0x77) == 0)
cfg = ibg; /* 'blank' attribute */
buffer->line[dev->displine][x * cw + i] = dev->cols[attr][blink][cfg];
buffer32->line[dev->displine][x * cw + i] = dev->cols[attr][blink][cfg];
val = val << 1;
}
}
@@ -405,7 +405,7 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
else
cfg |= ibg;
buffer->line[dev->displine][(x * cw) + i] = dev->cols[attr][blink][cfg];
buffer32->line[dev->displine][(x * cw) + i] = dev->cols[attr][blink][cfg];
val = val << 1;
}
}
@@ -449,7 +449,7 @@ text_line(herculesplus_t *dev, uint16_t ca)
col = dev->cols[attr][0][1];
for (c = 0; c < cw; c++)
buffer->line[dev->displine][x * cw + c] = col;
buffer32->line[dev->displine][x * cw + c] = col;
}
}
}
@@ -478,7 +478,7 @@ graphics_line(herculesplus_t *dev)
for (c = 0; c < 16; c++) {
val >>= 1;
buffer->line[dev->displine][(x << 4) + c] = (val & 1) ? 7 : 0;
buffer32->line[dev->displine][(x << 4) + c] = (val & 1) ? 7 : 0;
}
for (c = 0; c < 16; c += 8)
@@ -495,7 +495,7 @@ herculesplus_poll(void *priv)
int x, oldvc, oldsc;
if (! dev->linepos) {
dev->vidtime += dev->dispofftime;
timer_advance_u64(&dev->timer, dev->dispofftime);
dev->stat |= 1;
dev->linepos = 1;
oldsc = dev->sc;
@@ -519,7 +519,7 @@ herculesplus_poll(void *priv)
if (dev->displine >= 500)
dev->displine = 0;
} else {
dev->vidtime += dev->dispontime;
timer_advance_u64(&dev->timer, dev->dispontime);
if (dev->dispon)
dev->stat &= ~1;
dev->linepos = 0;
@@ -621,7 +621,7 @@ herculesplus_init(const device_t *info)
dev->vram = (uint8_t *)malloc(0x10000); /* 64k VRAM */
timer_add(herculesplus_poll, &dev->vidtime, TIMER_ALWAYS_ENABLED, dev);
timer_add(&dev->timer, herculesplus_poll, dev, 1);
mem_mapping_add(&dev->mapping, 0xb0000, 0x10000,
herculesplus_read,NULL,NULL,