More 808x fixed - fixed (kind of) the 8086 lock ups and the DRAM refresh wait states, also further fixed (and cleaned up) prefetch queue operation, applied a few warning fixes, and fixed the behavior of PUSH SP - anything that uses it to tell 808x apart from 286 is now fixed;
Re-added the higher-clocked 8088's; Fixed PIT timings for 808x CPU's that don't run off an 14.3 MHz crystal; Fixed CGA cursor half blink rate setting - fixes insane cursor blinking speed in several cases; DMA now issues DMA refresh DRAM states on every channel; Gave the 1982 years to the previously emulated PC and XT's names, and added the 1981 IBM PC and 1986 IBM XT; Redid the PPI DIP switch redout for the PC/XT keyboard controller; Fixed a segmentation fault in hdc_ide.c that tended to occur on hard reset after switching machines; Implemented the port 3B8 color disable on the Hercules, Hercules Plus, and Hercules InColor cards; Fixed the joystick configuration dialog strings; Fixed a problem that would have prevented win_sdl.c from compiling with logging enabled.
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
*
|
||||
* Hercules Plus emulation.
|
||||
*
|
||||
* Version: @(#)vid_herculesplus.c 1.0.14 2018/11/18
|
||||
* Version: @(#)vid_herculesplus.c 1.0.15 2019/02/07
|
||||
*
|
||||
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
|
||||
* Miran Grca, <mgrca8@gmail.com>
|
||||
@@ -113,6 +113,7 @@ static void
|
||||
herculesplus_out(uint16_t port, uint8_t val, void *priv)
|
||||
{
|
||||
herculesplus_t *dev = (herculesplus_t *)priv;
|
||||
uint8_t old;
|
||||
|
||||
switch (port) {
|
||||
case 0x3b0:
|
||||
@@ -127,6 +128,7 @@ herculesplus_out(uint16_t port, uint8_t val, void *priv)
|
||||
case 0x3b5:
|
||||
case 0x3b7:
|
||||
if (dev->crtcreg > 22) return;
|
||||
old = dev->crtc[dev->crtcreg];
|
||||
dev->crtc[dev->crtcreg] = val;
|
||||
if (dev->crtc[10] == 6 && dev->crtc[11] == 7) {
|
||||
/*Fix for Generic Turbo XT BIOS,
|
||||
@@ -134,11 +136,15 @@ herculesplus_out(uint16_t port, uint8_t val, void *priv)
|
||||
dev->crtc[10] = 0xb;
|
||||
dev->crtc[11] = 0xc;
|
||||
}
|
||||
recalc_timings(dev);
|
||||
if (old ^ val)
|
||||
recalc_timings(dev);
|
||||
return;
|
||||
|
||||
case 0x3b8:
|
||||
old = dev->ctrl;
|
||||
dev->ctrl = val;
|
||||
if (old ^ val)
|
||||
recalc_timings(dev);
|
||||
return;
|
||||
|
||||
case 0x3bf:
|
||||
@@ -414,8 +420,11 @@ text_line(herculesplus_t *dev, uint16_t ca)
|
||||
uint32_t col;
|
||||
|
||||
for (x = 0; x < dev->crtc[1]; x++) {
|
||||
chr = dev->vram[(dev->ma << 1) & 0xfff];
|
||||
attr = dev->vram[((dev->ma << 1) + 1) & 0xfff];
|
||||
if (dev->ctrl & 8) {
|
||||
chr = dev->vram[(dev->ma << 1) & 0xfff];
|
||||
attr = dev->vram[((dev->ma << 1) + 1) & 0xfff];
|
||||
} else
|
||||
chr = attr = 0;
|
||||
|
||||
drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
|
||||
|
||||
@@ -459,8 +468,11 @@ graphics_line(herculesplus_t *dev)
|
||||
ca += 0x8000;
|
||||
|
||||
for (x = 0; x < dev->crtc[1]; x++) {
|
||||
val = (dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane] << 8)
|
||||
| dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane + 1];
|
||||
if (dev->ctrl & 8)
|
||||
val = (dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane] << 8)
|
||||
| dev->vram[((dev->ma << 1) & 0x1fff) + ca + 0x10000 * plane + 1];
|
||||
else
|
||||
val = 0;
|
||||
|
||||
dev->ma++;
|
||||
for (c = 0; c < 16; c++) {
|
||||
@@ -559,7 +571,8 @@ herculesplus_poll(void *priv)
|
||||
else
|
||||
x = dev->crtc[1] * 9;
|
||||
dev->lastline++;
|
||||
if ((x != xsize) || ((dev->lastline - dev->firstline) != ysize) || video_force_resize_get()) {
|
||||
if ((dev->ctrl & 8) &&
|
||||
((x != xsize) || ((dev->lastline - dev->firstline) != ysize) || video_force_resize_get())) {
|
||||
xsize = x;
|
||||
ysize = dev->lastline - dev->firstline;
|
||||
if (xsize < 64) xsize = 656;
|
||||
|
||||
Reference in New Issue
Block a user