claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ma -> memaddr

Browse Source 
ma_latch -> memaddr_latch
maback -> memaddr_backup
ca -> cursoraddr
sc -> scanline
oldsc -> scanline_old
This commit is contained in:
starfrost013
2025-06-10 22:53:45 +01:00
parent 386c346ee1
commit dd7f3d0aae
63 changed files with 1428 additions and 1428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/video/vid_hercules_plus.c
View File

@@ -75,8 +75,8 @@ typedef struct {
int firstline, lastline;
int linepos, displine;
int vc, sc;
uint16_t ma, maback;
int vc, scanline;
uint16_t memaddr, memaddr_backup;
int cursorvisible, cursoron;
int dispon, blink;
int vsynctime;
@@ -260,11 +260,11 @@ draw_char_rom(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
else
elg = ((chr >= 0xc0) && (chr <= 0xdf));
fnt = &(fontdatm[chr][dev->sc]);
fnt = &(fontdatm[chr][dev->scanline]);
if (blk) {
val = 0x000; /* Blinking, draw all background */
} else if (dev->sc == ull) {
} else if (dev->scanline == ull) {
val = 0x1ff; /* Underscore, draw all foreground */
} else {
val = fnt[0] << 1;
@@ -319,11 +319,11 @@ draw_char_ram4(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
else
elg = ((chr >= 0xc0) && (chr <= 0xdf));
fnt = dev->vram + 0x4000 + 16 * chr + dev->sc;
fnt = dev->vram + 0x4000 + 16 * chr + dev->scanline;
if (blk) {
val = 0x000; /* Blinking, draw all background */
} else if (dev->sc == ull) {
} else if (dev->scanline == ull) {
val = 0x1ff; /* Underscore, draw all foreground */
} else {
val = fnt[0] << 1;
@@ -384,11 +384,11 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
else
elg = ((chr >= 0xc0) && (chr <= 0xdf));
fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->sc;
fnt = dev->vram + 0x4000 + 16 * chr + 4096 * font + dev->scanline;
if (blk) {
val = 0x000; /* Blinking, draw all background */
} else if (dev->sc == ull) {
} else if (dev->scanline == ull) {
val = 0x1ff; /* Underscore, draw all foreground */
} else {
val = fnt[0] << 1;
@@ -404,7 +404,7 @@ draw_char_ram48(herculesplus_t *dev, int x, uint8_t chr, uint8_t attr)
}
static void
text_line(herculesplus_t *dev, uint16_t ca)
text_line(herculesplus_t *dev, uint16_t cursoraddr)
{
int drawcursor;
uint8_t chr;
@@ -413,12 +413,12 @@ text_line(herculesplus_t *dev, uint16_t ca)
for (uint8_t x = 0; x < dev->crtc[1]; x++) {
if (dev->ctrl & 8) {
chr = dev->vram[(dev->ma << 1) & 0x3fff];
attr = dev->vram[((dev->ma << 1) + 1) & 0x3fff];
chr = dev->vram[(dev->memaddr << 1) & 0x3fff];
attr = dev->vram[((dev->memaddr << 1) + 1) & 0x3fff];
} else
chr = attr = 0;
drawcursor = ((dev->ma == ca) && dev->cursorvisible && dev->cursoron);
drawcursor = ((dev->memaddr == cursoraddr) && dev->cursorvisible && dev->cursoron);
switch (dev->crtc[HERCULESPLUS_CRTC_XMODE] & 5) {
case 0:
@@ -437,7 +437,7 @@ text_line(herculesplus_t *dev, uint16_t ca)
default:
break;
}
++dev->ma;
++dev->memaddr;
if (drawcursor) {
int cw = HERCULESPLUS_CW;
@@ -452,24 +452,24 @@ text_line(herculesplus_t *dev, uint16_t ca)
static void
graphics_line(herculesplus_t *dev)
{
uint16_t ca;
uint16_t cursoraddr;
int c;
int plane = 0;
uint16_t val;
/* Graphics mode. */
ca = (dev->sc & 3) * 0x2000;
cursoraddr = (dev->scanline & 3) * 0x2000;
if ((dev->ctrl & HERCULESPLUS_CTRL_PAGE1) && (dev->ctrl2 & HERCULESPLUS_CTRL2_PAGE1))
ca += 0x8000;
cursoraddr += 0x8000;
for (uint8_t x = 0; x < dev->crtc[1]; x++) {
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];
val = (dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane] << 8)
| dev->vram[((dev->memaddr << 1) & 0x1fff) + cursoraddr + 0x10000 * plane + 1];
else
val = 0;
dev->ma++;
dev->memaddr++;
for (c = 0; c < 16; c++) {
buffer32->line[dev->displine][(x << 4) + c] = (val & 0x8000) ? 7 : 0;
@@ -485,10 +485,10 @@ static void
herculesplus_poll(void *priv)
{
herculesplus_t *dev = (herculesplus_t *) priv;
uint16_t ca = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
uint16_t cursoraddr = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
int x;
int oldvc;
int oldsc;
int scanline_old;
int cw = HERCULESPLUS_CW;
VIDEO_MONITOR_PROLOGUE();
@@ -496,9 +496,9 @@ herculesplus_poll(void *priv)
timer_advance_u64(&dev->timer, dev->dispofftime);
dev->stat |= 1;
dev->linepos = 1;
oldsc = dev->sc;
scanline_old = dev->scanline;
if ((dev->crtc[8] & 3) == 3)
dev->sc = (dev->sc << 1) & 7;
dev->scanline = (dev->scanline << 1) & 7;
if (dev->dispon) {
if (dev->displine < dev->firstline) {
dev->firstline = dev->displine;
@@ -508,7 +508,7 @@ herculesplus_poll(void *priv)
if ((dev->ctrl & HERCULESPLUS_CTRL_GRAPH) && (dev->ctrl2 & HERCULESPLUS_CTRL2_GRAPH))
graphics_line(dev);
else
text_line(dev, ca);
text_line(dev, cursoraddr);
if ((dev->ctrl & HERCULESPLUS_CTRL_GRAPH) && (dev->ctrl2 & HERCULESPLUS_CTRL2_GRAPH))
x = dev->crtc[1] << 4;
@@ -517,8 +517,8 @@ herculesplus_poll(void *priv)
video_process_8(x, dev->displine);
}
dev->sc = oldsc;
if (dev->vc == dev->crtc[7] && !dev->sc)
dev->scanline = scanline_old;
if (dev->vc == dev->crtc[7] && !dev->scanline)
dev->stat |= 8;
dev->displine++;
if (dev->displine >= 500)
@@ -534,22 +534,22 @@ herculesplus_poll(void *priv)
dev->stat &= ~8;
}
if (dev->sc == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[11] & 31) >> 1))) {
if (dev->scanline == (dev->crtc[11] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[11] & 31) >> 1))) {
dev->cursorvisible = 0;
}
if (dev->vadj) {
dev->sc++;
dev->sc &= 31;
dev->ma = dev->maback;
dev->scanline++;
dev->scanline &= 31;
dev->memaddr = dev->memaddr_backup;
dev->vadj--;
if (!dev->vadj) {
dev->dispon = 1;
dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
dev->sc = 0;
dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
dev->scanline = 0;
}
} else if (dev->sc == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->sc == (dev->crtc[9] >> 1))) {
dev->maback = dev->ma;
dev->sc = 0;
} else if (dev->scanline == dev->crtc[9] || ((dev->crtc[8] & 3) == 3 && dev->scanline == (dev->crtc[9] >> 1))) {
dev->memaddr_backup = dev->memaddr;
dev->scanline = 0;
oldvc = dev->vc;
dev->vc++;
dev->vc &= 127;
@@ -561,7 +561,7 @@ herculesplus_poll(void *priv)
if (!dev->vadj)
dev->dispon = 1;
if (!dev->vadj)
dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
dev->memaddr = dev->memaddr_backup = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
if ((dev->crtc[10] & 0x60) == 0x20)
dev->cursoron = 0;
else
@@ -606,12 +606,12 @@ herculesplus_poll(void *priv)
dev->blink++;
}
} else {
dev->sc++;
dev->sc &= 31;
dev->ma = dev->maback;
dev->scanline++;
dev->scanline &= 31;
dev->memaddr = dev->memaddr_backup;
}
if (dev->sc == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->sc == ((dev->crtc[10] & 31) >> 1)))
if (dev->scanline == (dev->crtc[10] & 31) || ((dev->crtc[8] & 3) == 3 && dev->scanline == ((dev->crtc[10] & 31) >> 1)))
dev->cursorvisible = 1;
}