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

Sanitize the Compaq CGA code.

Browse Source
This commit is contained in:
OBattler
2025-06-09 19:26:17 +02:00
parent c3bb3002c1
commit 8e72150fa3
1 changed files with 200 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

388
src/video/vid_compaq_cga.c
View File

@@ -44,10 +44,6 @@
static uint32_t vflags; static uint32_t vflags;
static uint8_t mdaattr[256][2][2]; static uint8_t mdaattr[256][2][2];
typedef struct compaq_cga_t {
cga_t cga;
} compaq_cga_t;
#ifdef ENABLE_COMPAQ_CGA_LOG #ifdef ENABLE_COMPAQ_CGA_LOG
int compaq_cga_do_log = ENABLE_COMPAQ_CGA_LOG; int compaq_cga_do_log = ENABLE_COMPAQ_CGA_LOG;
@@ -66,93 +62,93 @@ compaq_cga_log(const char *fmt, ...)
# define compaq_cga_log(fmt, ...) # define compaq_cga_log(fmt, ...)
#endif #endif
void static void
compaq_cga_recalctimings(compaq_cga_t *self) compaq_cga_recalctimings(cga_t *dev)
{ {
double _dispontime; double _dispontime;
double _dispofftime; double _dispofftime;
double disptime; double disptime;
disptime = self->cga.crtc[0] + 1; disptime = dev->crtc[0] + 1;
_dispontime = self->cga.crtc[1]; _dispontime = dev->crtc[1];
_dispofftime = disptime - _dispontime; _dispofftime = disptime - _dispontime;
_dispontime *= MDACONST; _dispontime *= MDACONST;
_dispofftime *= MDACONST; _dispofftime *= MDACONST;
self->cga.dispontime = (uint64_t) (_dispontime); dev->dispontime = (uint64_t) (_dispontime);
self->cga.dispofftime = (uint64_t) (_dispofftime); dev->dispofftime = (uint64_t) (_dispofftime);
} }
void static void
compaq_cga_poll(void *priv) compaq_cga_poll(void *priv)
{ {
compaq_cga_t *self = (compaq_cga_t *) priv; cga_t *dev = (cga_t *) priv;
uint16_t ca = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x3fff; uint16_t ca = (dev->crtc[15] | (dev->crtc[14] << 8)) & 0x3fff;
int drawcursor; int underline = 0;
int x; int blink = 0;
int c; int drawcursor;
int xs_temp; int x;
int ys_temp; int c;
int oldvc; int xs_temp;
uint8_t chr; int ys_temp;
uint8_t attr; int oldvc;
uint8_t border; uint8_t chr;
uint8_t cols[4]; uint8_t attr;
int oldsc; uint8_t border;
int underline = 0; uint8_t cols[4];
int blink = 0; int oldsc;
/* If in graphics mode or character height is not 13, behave as CGA */ /* If in graphics mode or character height is not 13, behave as CGA */
if ((self->cga.cgamode & 0x12) || (self->cga.crtc[9] != 13)) { if ((dev->cgamode & 0x12) || (dev->crtc[9] != 13)) {
overscan_x = overscan_y = 16; overscan_x = overscan_y = 16;
cga_poll(&self->cga); cga_poll(dev);
return; return;
} else } else
overscan_x = overscan_y = 0; overscan_x = overscan_y = 0;
/* We are in Compaq 350-line CGA territory */ /* We are in Compaq 350-line CGA territory */
if (!self->cga.linepos) { if (!dev->linepos) {
timer_advance_u64(&self->cga.timer, self->cga.dispofftime); timer_advance_u64(&dev->timer, dev->dispofftime);
self->cga.cgastat |= 1; dev->cgastat |= 1;
self->cga.linepos = 1; dev->linepos = 1;
oldsc = self->cga.sc; oldsc = dev->sc;
if ((self->cga.crtc[8] & 3) == 3) if ((dev->crtc[8] & 3) == 3)
self->cga.sc = ((self->cga.sc << 1) + self->cga.oddeven) & 7; dev->sc = ((dev->sc << 1) + dev->oddeven) & 7;
if (self->cga.cgadispon) { if (dev->cgadispon) {
if (self->cga.displine < self->cga.firstline) { if (dev->displine < dev->firstline) {
self->cga.firstline = self->cga.displine; dev->firstline = dev->displine;
video_wait_for_buffer(); video_wait_for_buffer();
compaq_cga_log("Firstline %i\n", self->cga.firstline); compaq_cga_log("Firstline %i\n", dev->firstline);
} }
self->cga.lastline = self->cga.displine; dev->lastline = dev->displine;
cols[0] = (self->cga.cgacol & 15) + 16; cols[0] = (dev->cgacol & 15) + 16;
for (c = 0; c < 8; c++) { for (c = 0; c < 8; c++) {
buffer32->line[self->cga.displine][c] = cols[0]; buffer32->line[dev->displine][c] = cols[0];
if (self->cga.cgamode & 1) if (dev->cgamode & 1)
buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 3) + 8] = cols[0]; buffer32->line[dev->displine][c + (dev->crtc[1] << 3) + 8] = cols[0];
else else
buffer32->line[self->cga.displine][c + (self->cga.crtc[1] << 4) + 8] = cols[0]; buffer32->line[dev->displine][c + (dev->crtc[1] << 4) + 8] = cols[0];
} }
if (self->cga.cgamode & 1) { if (dev->cgamode & 1) {
for (x = 0; x < self->cga.crtc[1]; x++) { for (x = 0; x < dev->crtc[1]; x++) {
chr = self->cga.charbuffer[x << 1]; chr = dev->charbuffer[x << 1];
attr = self->cga.charbuffer[(x << 1) + 1]; attr = dev->charbuffer[(x << 1) + 1];
drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron); drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
if (vflags) { if (vflags) {
underline = 0; underline = 0;
blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor); blink = ((dev->cgablink & 8) && (dev->cgamode & 0x20) && (attr & 0x80) && !drawcursor);
} }
if (vflags && (self->cga.cgamode & 0x80)) { if (vflags && (dev->cgamode & 0x80)) {
cols[0] = mdaattr[attr][blink][0]; cols[0] = mdaattr[attr][blink][0];
cols[1] = mdaattr[attr][blink][1]; cols[1] = mdaattr[attr][blink][1];
if ((self->cga.sc == 12) && ((attr & 7) == 1)) if ((dev->sc == 12) && ((attr & 7) == 1))
underline = 1; underline = 1;
} else if (self->cga.cgamode & 0x20) { } else if (dev->cgamode & 0x20) {
cols[1] = (attr & 15) + 16; cols[1] = (attr & 15) + 16;
cols[0] = ((attr >> 4) & 7) + 16; cols[0] = ((attr >> 4) & 7) + 16;
@@ -160,7 +156,7 @@ compaq_cga_poll(void *priv)
if (blink) if (blink)
cols[1] = cols[0]; cols[1] = cols[0];
} else { } else {
if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor) if ((dev->cgablink & 8) && (attr & 0x80) && !dev->drawcursor)
cols[1] = cols[0]; cols[1] = cols[0];
} }
} else { } else {
@@ -170,33 +166,35 @@ compaq_cga_poll(void *priv)
if (vflags && underline) { if (vflags && underline) {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 3) + c + 8] = mdaattr[attr][blink][1]; buffer32->line[dev->displine][(x << 3) + c + 8] = mdaattr[attr][blink][1];
} else if (drawcursor) { } else if (drawcursor) {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15; buffer32->line[dev->displine][(x << 3) + c + 8] =
cols[(fontdatm[chr + dev->fontbase][dev->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
} else { } else {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 3) + c + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0]; buffer32->line[dev->displine][(x << 3) + c + 8] =
cols[(fontdatm[chr + dev->fontbase][dev->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
} }
self->cga.ma++; dev->ma++;
} }
} else { } else {
for (x = 0; x < self->cga.crtc[1]; x++) { for (x = 0; x < dev->crtc[1]; x++) {
chr = self->cga.vram[(self->cga.ma << 1) & 0x3fff]; chr = dev->vram[(dev->ma << 1) & 0x3fff];
attr = self->cga.vram[((self->cga.ma << 1) + 1) & 0x3fff]; attr = dev->vram[((dev->ma << 1) + 1) & 0x3fff];
drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron); drawcursor = ((dev->ma == ca) && dev->con && dev->cursoron);
if (vflags) { if (vflags) {
underline = 0; underline = 0;
blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor); blink = ((dev->cgablink & 8) && (dev->cgamode & 0x20) && (attr & 0x80) && !drawcursor);
} }
if (vflags && (self->cga.cgamode & 0x80)) { if (vflags && (dev->cgamode & 0x80)) {
cols[0] = mdaattr[attr][blink][0]; cols[0] = mdaattr[attr][blink][0];
cols[1] = mdaattr[attr][blink][1]; cols[1] = mdaattr[attr][blink][1];
if (self->cga.sc == 12 && (attr & 7) == 1) if (dev->sc == 12 && (attr & 7) == 1)
underline = 1; underline = 1;
} else if (self->cga.cgamode & 0x20) { } else if (dev->cgamode & 0x20) {
cols[1] = (attr & 15) + 16; cols[1] = (attr & 15) + 16;
cols[0] = ((attr >> 4) & 7) + 16; cols[0] = ((attr >> 4) & 7) + 16;
@@ -204,128 +202,134 @@ compaq_cga_poll(void *priv)
if (blink) if (blink)
cols[1] = cols[0]; cols[1] = cols[0];
} else { } else {
if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor) if ((dev->cgablink & 8) && (attr & 0x80) && !dev->drawcursor)
cols[1] = cols[0]; cols[1] = cols[0];
} }
} else { } else {
cols[1] = (attr & 15) + 16; cols[1] = (attr & 15) + 16;
cols[0] = (attr >> 4) + 16; cols[0] = (attr >> 4) + 16;
} }
self->cga.ma++; dev->ma++;
if (vflags && underline) { if (vflags && underline) {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 9] = mdaattr[attr][blink][1]; buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
buffer32->line[dev->displine][(x << 4) + (c << 1) + 9] = mdaattr[attr][blink][1];
} else if (drawcursor) { } else if (drawcursor) {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15; buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
buffer32->line[dev->displine][(x << 4) + (c << 1) + 1 + 8] =
cols[(fontdatm[chr + dev->fontbase][dev->sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
} else { } else {
for (c = 0; c < 8; c++) for (c = 0; c < 8; c++)
buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 8] = buffer32->line[self->cga.displine][(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr + self->cga.fontbase][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0]; buffer32->line[dev->displine][(x << 4) + (c << 1) + 8] =
buffer32->line[dev->displine][(x << 4) + (c << 1) + 1 + 8] =
cols[(fontdatm[chr + dev->fontbase][dev->sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
} }
} }
} }
} else { } else {
cols[0] = (self->cga.cgacol & 15) + 16; cols[0] = (dev->cgacol & 15) + 16;
if (self->cga.cgamode & 1) if (dev->cgamode & 1)
hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 3) + 16, cols[0]); hline(buffer32, 0, dev->displine, (dev->crtc[1] << 3) + 16, cols[0]);
else else
hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 4) + 16, cols[0]); hline(buffer32, 0, dev->displine, (dev->crtc[1] << 4) + 16, cols[0]);
} }
if (self->cga.cgamode & 1) if (dev->cgamode & 1)
x = (self->cga.crtc[1] << 3) + 16; x = (dev->crtc[1] << 3) + 16;
else else
x = (self->cga.crtc[1] << 4) + 16; x = (dev->crtc[1] << 4) + 16;
if (self->cga.composite) { if (dev->composite) {
if (self->cga.cgamode & 0x10) if (dev->cgamode & 0x10)
border = 0x00; border = 0x00;
else else
border = self->cga.cgacol & 0x0f; border = dev->cgacol & 0x0f;
if (vflags) if (vflags)
Composite_Process(self->cga.cgamode & 0x7f, border, x >> 2, buffer32->line[self->cga.displine]); Composite_Process(dev->cgamode & 0x7f, border, x >> 2, buffer32->line[dev->displine]);
else else
Composite_Process(self->cga.cgamode, border, x >> 2, buffer32->line[self->cga.displine]); Composite_Process(dev->cgamode, border, x >> 2, buffer32->line[dev->displine]);
} else } else
video_process_8(x, self->cga.displine); video_process_8(x, dev->displine);
self->cga.sc = oldsc; dev->sc = oldsc;
if (self->cga.vc == self->cga.crtc[7] && !self->cga.sc) if (dev->vc == dev->crtc[7] && !dev->sc)
self->cga.cgastat |= 8; dev->cgastat |= 8;
self->cga.displine++; dev->displine++;
if (self->cga.displine >= 500) if (dev->displine >= 500)
self->cga.displine = 0; dev->displine = 0;
} else { } else {
timer_advance_u64(&self->cga.timer, self->cga.dispontime); timer_advance_u64(&dev->timer, dev->dispontime);
self->cga.linepos = 0; dev->linepos = 0;
if (self->cga.vsynctime) { if (dev->vsynctime) {
self->cga.vsynctime--; dev->vsynctime--;
if (!self->cga.vsynctime) if (!dev->vsynctime)
self->cga.cgastat &= ~8; dev->cgastat &= ~8;
} }
if (self->cga.sc == (self->cga.crtc[11] & 31) || ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == ((self->cga.crtc[11] & 31) >> 1))) { if (dev->sc == (dev->crtc[11] & 31) || (((dev->crtc[8] & 3) == 3) &&
self->cga.con = 0; (dev->sc == ((dev->crtc[11] & 31) >> 1)))) {
dev->con = 0;
} }
if ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == (self->cga.crtc[9] >> 1)) if ((dev->crtc[8] & 3) == 3 && dev->sc == (dev->crtc[9] >> 1))
self->cga.maback = self->cga.ma; dev->maback = dev->ma;
if (self->cga.vadj) { if (dev->vadj) {
self->cga.sc++; dev->sc++;
self->cga.sc &= 31; dev->sc &= 31;
self->cga.ma = self->cga.maback; dev->ma = dev->maback;
self->cga.vadj--; dev->vadj--;
if (!self->cga.vadj) { if (!dev->vadj) {
self->cga.cgadispon = 1; dev->cgadispon = 1;
self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff; dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
self->cga.sc = 0; dev->sc = 0;
} }
} else if (self->cga.sc == self->cga.crtc[9]) { } else if (dev->sc == dev->crtc[9]) {
self->cga.maback = self->cga.ma; dev->maback = dev->ma;
self->cga.sc = 0; dev->sc = 0;
oldvc = self->cga.vc; oldvc = dev->vc;
self->cga.vc++; dev->vc++;
self->cga.vc &= 127; dev->vc &= 127;
if (self->cga.vc == self->cga.crtc[6]) if (dev->vc == dev->crtc[6])
self->cga.cgadispon = 0; dev->cgadispon = 0;
if (oldvc == self->cga.crtc[4]) { if (oldvc == dev->crtc[4]) {
self->cga.vc = 0; dev->vc = 0;
self->cga.vadj = self->cga.crtc[5]; dev->vadj = dev->crtc[5];
if (!self->cga.vadj) if (!dev->vadj)
self->cga.cgadispon = 1; dev->cgadispon = 1;
if (!self->cga.vadj) if (!dev->vadj)
self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff; dev->ma = dev->maback = (dev->crtc[13] | (dev->crtc[12] << 8)) & 0x3fff;
if ((self->cga.crtc[10] & 0x60) == 0x20) if ((dev->crtc[10] & 0x60) == 0x20)
self->cga.cursoron = 0; dev->cursoron = 0;
else else
self->cga.cursoron = self->cga.cgablink & 8; dev->cursoron = dev->cgablink & 8;
} }
if (self->cga.vc == self->cga.crtc[7]) { if (dev->vc == dev->crtc[7]) {
self->cga.cgadispon = 0; dev->cgadispon = 0;
self->cga.displine = 0; dev->displine = 0;
self->cga.vsynctime = 16; dev->vsynctime = 16;
if (self->cga.crtc[7]) { if (dev->crtc[7]) {
compaq_cga_log("Lastline %i Firstline %i %i\n", self->cga.lastline, compaq_cga_log("Lastline %i Firstline %i %i\n", dev->lastline,
self->cga.firstline, self->cga.lastline - self->cga.firstline); dev->firstline, dev->lastline - dev->firstline);
if (self->cga.cgamode & 1) if (dev->cgamode & 1)
x = (self->cga.crtc[1] << 3) + 16; x = (dev->crtc[1] << 3) + 16;
else else
x = (self->cga.crtc[1] << 4) + 16; x = (dev->crtc[1] << 4) + 16;
self->cga.lastline++; dev->lastline++;
xs_temp = x; xs_temp = x;
ys_temp = (self->cga.lastline - self->cga.firstline); ys_temp = (dev->lastline - dev->firstline);
if ((xs_temp > 0) && (ys_temp > 0)) { if ((xs_temp > 0) && (ys_temp > 0)) {
if (xs_temp < 64) if (xs_temp < 64)
@@ -335,7 +339,8 @@ compaq_cga_poll(void *priv)
if (!enable_overscan) if (!enable_overscan)
xs_temp -= 16; xs_temp -= 16;
if ((self->cga.cgamode & 8) && ((xs_temp != xsize) || (ys_temp != ysize) || video_force_resize_get())) { if ((dev->cgamode & 8) && ((xs_temp != xsize) ||
(ys_temp != ysize) || video_force_resize_get())) {
xsize = xs_temp; xsize = xs_temp;
ysize = ys_temp; ysize = ys_temp;
set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0)); set_screen_size(xsize, ysize + (enable_overscan ? 16 : 0));
@@ -345,9 +350,9 @@ compaq_cga_poll(void *priv)
} }
if (enable_overscan) if (enable_overscan)
video_blit_memtoscreen(0, self->cga.firstline - 8, xsize, (self->cga.lastline - self->cga.firstline) + 16); video_blit_memtoscreen(0, dev->firstline - 8, xsize, (dev->lastline - dev->firstline) + 16);
else else
video_blit_memtoscreen(8, self->cga.firstline, xsize, self->cga.lastline - self->cga.firstline); video_blit_memtoscreen(8, dev->firstline, xsize, dev->lastline - dev->firstline);
} }
frames++; frames++;
@@ -356,63 +361,69 @@ compaq_cga_poll(void *priv)
if (enable_overscan) if (enable_overscan)
xsize -= 16; xsize -= 16;
video_res_y = ysize; video_res_y = ysize;
if (self->cga.cgamode & 1) { if (dev->cgamode & 1) {
video_res_x /= 8; video_res_x /= 8;
video_res_y /= self->cga.crtc[9] + 1; video_res_y /= dev->crtc[9] + 1;
video_bpp = 0; video_bpp = 0;
} else if (!(self->cga.cgamode & 2)) { } else if (!(dev->cgamode & 2)) {
video_res_x /= 16; video_res_x /= 16;
video_res_y /= self->cga.crtc[9] + 1; video_res_y /= dev->crtc[9] + 1;
video_bpp = 0; video_bpp = 0;
} else if (!(self->cga.cgamode & 16)) { } else if (!(dev->cgamode & 16)) {
video_res_x /= 2; video_res_x /= 2;
video_bpp = 2; video_bpp = 2;
} else } else
video_bpp = 1; video_bpp = 1;
} }
self->cga.firstline = 1000; dev->firstline = 1000;
self->cga.lastline = 0; dev->lastline = 0;
self->cga.cgablink++; dev->cgablink++;
self->cga.oddeven ^= 1; dev->oddeven ^= 1;
} }
} else { } else {
self->cga.sc++; dev->sc++;
self->cga.sc &= 31; dev->sc &= 31;
self->cga.ma = self->cga.maback; dev->ma = dev->maback;
} }
if (self->cga.cgadispon) if (dev->cgadispon)
self->cga.cgastat &= ~1; dev->cgastat &= ~1;
if (self->cga.sc == (self->cga.crtc[10] & 31) || ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == ((self->cga.crtc[10] & 31) >> 1))) if (dev->sc == (dev->crtc[10] & 31) ||
self->cga.con = 1; (((dev->crtc[8] & 3) == 3) && (dev->sc == ((dev->crtc[10] & 31) >> 1))))
dev->con = 1;
if (self->cga.cgadispon && (self->cga.cgamode & 1)) { if (dev->cgadispon && (dev->cgamode & 1)) {
for (x = 0; x < (self->cga.crtc[1] << 1); x++) for (x = 0; x < (dev->crtc[1] << 1); x++)
self->cga.charbuffer[x] = self->cga.vram[((self->cga.ma << 1) + x) & 0x3fff]; dev->charbuffer[x] = dev->vram[((dev->ma << 1) + x) & 0x3fff];
} }
} }
} }
void * static void *
compaq_cga_init(const device_t *info) compaq_cga_init(const device_t *info)
{ {
int display_type; int display_type;
compaq_cga_t *self = malloc(sizeof(compaq_cga_t)); cga_t *dev = calloc(1, sizeof(cga_t));
memset(self, 0, sizeof(compaq_cga_t));
display_type = device_get_config_int("display_type"); display_type = device_get_config_int("display_type");
self->cga.composite = (display_type != CGA_RGB); dev->composite = (display_type != CGA_RGB);
self->cga.revision = device_get_config_int("composite_type"); dev->revision = device_get_config_int("composite_type");
self->cga.snow_enabled = device_get_config_int("snow_enabled"); dev->snow_enabled = device_get_config_int("snow_enabled");
self->cga.vram = malloc(0x4000); dev->vram = malloc(0x4000);
cga_comp_init(self->cga.revision); cga_comp_init(dev->revision);
timer_add(&self->cga.timer, compaq_cga_poll, self, 1); timer_add(&dev->timer, compaq_cga_poll, dev, 1);
mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL /*self->cga.vram*/, MEM_MAPPING_EXTERNAL, self); mem_mapping_add(&dev->mapping, 0xb8000, 0x08000,
io_sethandler(0x03d0, 0x0010, cga_in, NULL, NULL, cga_out, NULL, NULL, self); cga_read, NULL, NULL,
cga_write, NULL, NULL,
NULL, MEM_MAPPING_EXTERNAL, dev);
io_sethandler(0x03d0, 0x0010,
cga_in, NULL, NULL,
cga_out, NULL, NULL,
dev);
if (info->local) { if (info->local) {
for (uint16_t c = 0; c < 256; c++) { for (uint16_t c = 0; c < 256; c++) {
@@ -441,33 +452,34 @@ compaq_cga_init(const device_t *info)
overscan_x = overscan_y = 16; overscan_x = overscan_y = 16;
self->cga.rgb_type = device_get_config_int("rgb_type"); dev->rgb_type = device_get_config_int("rgb_type");
cga_palette = (self->cga.rgb_type << 1); cga_palette = (dev->rgb_type << 1);
cgapal_rebuild(); cgapal_rebuild();
self->cga.crtc[9] = 13; dev->crtc[9] = 13;
return self; return dev;
} }
void static void
compaq_cga_close(void *priv) compaq_cga_close(void *priv)
{ {
compaq_cga_t *self = (compaq_cga_t *) priv; cga_t *dev = (cga_t *) priv;
free(self->cga.vram); free(dev->vram);
free(self); free(dev);
} }
void static void
compaq_cga_speed_changed(void *priv) compaq_cga_speed_changed(void *priv)
{ {
compaq_cga_t *self = (compaq_cga_t *) priv; cga_t *dev = (cga_t *) priv;
if (self->cga.crtc[9] == 13) /* Character height */ if (dev->crtc[9] == 13)
compaq_cga_recalctimings(self); /* Character height */
compaq_cga_recalctimings(dev);
else else
cga_recalctimings(&self->cga); cga_recalctimings(dev);
} }
extern const device_config_t cga_config[]; extern const device_config_t cga_config[];