diff --git a/src/machine/m_at_compaq.c b/src/machine/m_at_compaq.c
index ddc6e3537..d2741be3c 100644
--- a/src/machine/m_at_compaq.c
+++ b/src/machine/m_at_compaq.c
@@ -8,7 +8,7 @@
*
* Emulation of various Compaq PC's.
*
- * Version: @(#)m_at_compaq.c 1.0.1 2017/11/11
+ * Version: @(#)m_at_compaq.c 1.0.2 2017/12/29
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -117,6 +117,7 @@ machine_at_compaq_init(machine_t *model)
case ROM_PORTABLEII:
break;
+#ifdef PORTABLE3
case ROM_PORTABLEIII:
machine_olim24_video_init();
break;
@@ -126,5 +127,6 @@ machine_at_compaq_init(machine_t *model)
if (hdc_current == 1)
ide_init();
break;
+#endif
}
}
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index ef41f5dac..2bfe91fa3 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -11,7 +11,7 @@
* NOTES: OpenAT wip for 286-class machine with open BIOS.
* PS2_M80-486 wip, pending receipt of TRM's for machine.
*
- * Version: @(#)machine_table.c 1.0.7 2017/12/25
+ * Version: @(#)machine_table.c 1.0.8 2017/12/29
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -36,7 +36,7 @@
machine_t machines[] = {
{ "[8088] AMI XT clone", ROM_AMIXT, "amixt", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL },
- { "[8088] Compaq Portable", ROM_PORTABLE, "portable", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_xt_compaq_init, NULL, NULL },
+ { "[8088] Compaq Portable", ROM_PORTABLE, "portable", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_xt_compaq_init, NULL, NULL },
{ "[8088] DTK XT clone", ROM_DTKXT, "dtk", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 64, 0, machine_xt_init, NULL, NULL },
{ "[8088] IBM PC", ROM_IBMPC, "ibmpc", {{"", cpus_8088}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA, 64, 640, 32, 0, machine_xt_init, NULL, NULL },
{ "[8088] IBM PCjr", ROM_IBMPCJR, "ibmpcjr", {{"", cpus_pcjr}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_VIDEO, 128, 640, 128, 0, machine_pcjr_init, NULL, NULL },
@@ -62,7 +62,9 @@ machine_t machines[] = {
{ "[286 ISA] Award 286 clone", ROM_AWARD286, "award286", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close },
{ "[286 ISA] Commodore PC 30 III", ROM_CMDPC30, "cmdpc30", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_cmdpc_init, NULL, nvr_at_close },
{ "[286 ISA] Compaq Portable II", ROM_PORTABLEII, "portableii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close },
+#ifdef PORTABLE3
{ "[286 ISA] Compaq Portable III", ROM_PORTABLEIII, "portableiii", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_VIDEO, 640,16384, 128, 127, machine_at_compaq_init, NULL, nvr_at_close },
+#endif
{ "[286 ISA] Hyundai Super-286TR", ROM_SUPER286TR, "super286tr", {{"", cpus_286}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 512,16384, 128, 127, machine_at_scat_init, NULL, nvr_at_close },
{ "[286 ISA] IBM AT", ROM_IBMAT, "ibmat", {{"", cpus_ibmat}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT, 256,15872, 128, 63, machine_at_top_remap_init, NULL, nvr_at_close },
{ "[286 ISA] IBM PS/1 model 2011", ROM_IBMPS1_2011, "ibmps1es", {{"", cpus_ps1_m2011}, {"", NULL}, {"", NULL}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 512,16384, 512, 127, machine_ps1_m2011_init, NULL, nvr_at_close },
@@ -88,7 +90,9 @@ machine_t machines[] = {
{ "[386DX ISA] Amstrad MegaPC 386DX", ROM_MEGAPCDX, "megapcdx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_VIDEO, 1, 16, 1, 127, machine_at_wd76c10_init, NULL, nvr_at_close },
{ "[386DX ISA] Award 386DX clone", ROM_AWARD386DX_OPTI495, "award386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close },
{ "[386DX ISA] MR 386DX clone", ROM_MR386DX_OPTI495, "mr386dx", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 0, MACHINE_ISA | MACHINE_AT | MACHINE_HDC, 1, 64, 1, 127, machine_at_opti495_init, NULL, nvr_at_close },
+#ifdef PORTABLE3
{ "[386DX ISA] Compaq Portable III (386)", ROM_PORTABLEIII386, "portableiii386", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_ISA | MACHINE_AT | MACHINE_HDC | MACHINE_VIDEO, 1, 14, 1, 127, machine_at_compaq_init, NULL, nvr_at_close },
+#endif
{ "[386DX MCA] IBM PS/2 model 80", ROM_IBMPS2_M80, "ibmps2_m80", {{"Intel", cpus_i386DX}, {"AMD", cpus_Am386DX}, {"Cyrix", cpus_486DLC}, {"", NULL}, {"", NULL}}, 1, MACHINE_MCA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC_PS2, 1, 12, 1, 63, machine_ps2_model_80_init, NULL, nvr_at_close },
diff --git a/src/rom.c b/src/rom.c
index 1aea0dfc6..04eb41e1b 100644
--- a/src/rom.c
+++ b/src/rom.c
@@ -13,7 +13,7 @@
* - c386sx16 BIOS fails checksum
* - the loadfont() calls should be done elsewhere
*
- * Version: @(#)rom.c 1.0.21 2017/12/25
+ * Version: @(#)rom.c 1.0.22 2017/12/29
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -409,6 +409,7 @@ rom_load_bios(int rom_id)
biosmask = 0x7fff;
return(1);
+#ifdef PORTABLE3
case ROM_PORTABLEIII:
case ROM_PORTABLEIII386:
if (rom_load_interleaved(
@@ -416,6 +417,7 @@ rom_load_bios(int rom_id)
L"roms/machines/portableiii/109737-002.bin",
0x000000, 65536, 0, rom)) return(1);
break;
+#endif
case ROM_DTKXT:
if (rom_load_linear(
diff --git a/src/rom.h b/src/rom.h
index 0c71da517..bad57cdbf 100644
--- a/src/rom.h
+++ b/src/rom.h
@@ -8,7 +8,7 @@
*
* Definitions for the ROM image handler.
*
- * Version: @(#)rom.h 1.0.7 2017/12/25
+ * Version: @(#)rom.h 1.0.8 2017/12/29
*
* Author: Fred N. van Kempen,
* Copyright 2017 Fred N. van Kempen.
@@ -75,8 +75,10 @@ enum {
ROM_DESKPRO_386,
ROM_PORTABLE,
ROM_PORTABLEII,
+#ifdef PORTABLE3
ROM_PORTABLEIII,
ROM_PORTABLEIII386,
+#endif
ROM_IBMPS1_2121,
ROM_AMI386DX_OPTI495,
diff --git a/src/video/vid_cga.c b/src/video/vid_cga.c
index 711fa7627..d9b197a6a 100644
--- a/src/video/vid_cga.c
+++ b/src/video/vid_cga.c
@@ -510,7 +510,7 @@ void cga_speed_changed(void *p)
cga_recalctimings(cga);
}
-static device_config_t cga_config[] =
+device_config_t cga_config[] =
{
{
"display_type", "Display type", CONFIG_SELECTION, "", CGA_RGB,
diff --git a/src/video/vid_cga.h b/src/video/vid_cga.h
index 4ef61c4e2..2724ac0ec 100644
--- a/src/video/vid_cga.h
+++ b/src/video/vid_cga.h
@@ -8,7 +8,7 @@
*
* Emulation of the old and new IBM CGA graphics cards.
*
- * Version: @(#)vid_cga.h 1.0.0 2017/05/30
+ * Version: @(#)vid_cga.h 1.0.1 2017/12/29
*
* Author: Sarah Walker,
* Miran Grca,
@@ -60,4 +60,5 @@ uint8_t cga_read(uint32_t addr, void *p);
void cga_recalctimings(cga_t *cga);
void cga_poll(void *p);
+extern device_config_t cga_config[];
extern device_t cga_device;
diff --git a/src/video/vid_compaq_cga.c b/src/video/vid_compaq_cga.c
new file mode 100644
index 000000000..346befc20
--- /dev/null
+++ b/src/video/vid_compaq_cga.c
@@ -0,0 +1,463 @@
+#include
+#include
+#include
+#include
+#include
+#include
+#include "../86box.h"
+#include "../cpu/cpu.h"
+#include "../io.h"
+#include "../pit.h"
+#include "../mem.h"
+#include "../rom.h"
+#include "../timer.h"
+#include "../device.h"
+#include "video.h"
+#include "vid_cga.h"
+#include "vid_cga_comp.h"
+
+#define CGA_RGB 0
+#define CGA_COMPOSITE 1
+
+typedef struct compaq_cga_t
+{
+ cga_t cga;
+ uint32_t flags;
+} compaq_cga_t;
+
+static uint8_t mdaattr[256][2][2];
+
+void compaq_cga_recalctimings(compaq_cga_t *self)
+{
+ double _dispontime, _dispofftime, disptime;
+ disptime = self->cga.crtc[0] + 1;
+ _dispontime = self->cga.crtc[1];
+ _dispofftime = disptime - _dispontime;
+ _dispontime *= MDACONST;
+ _dispofftime *= MDACONST;
+ self->cga.dispontime = (int)(_dispontime * (1 << TIMER_SHIFT));
+ self->cga.dispofftime = (int)(_dispofftime * (1 << TIMER_SHIFT));
+}
+
+void compaq_cga_poll(void *p)
+{
+ compaq_cga_t *self = (compaq_cga_t *)p;
+ uint16_t ca = (self->cga.crtc[15] | (self->cga.crtc[14] << 8)) & 0x3fff;
+ int drawcursor;
+ int x, c;
+ int oldvc;
+ uint8_t chr, attr;
+ uint32_t cols[4];
+ int oldsc;
+ int underline = 0;
+ int blink = 0;
+
+ /* If in graphics mode or character height is not 13, behave as CGA */
+ if ((self->cga.cgamode & 0x12) || (self->cga.crtc[9] != 13))
+ {
+ overscan_x = overscan_y = 16;
+ cga_poll(&self->cga);
+ return;
+ } else
+ overscan_x = overscan_y = 0;
+
+/* We are in Compaq 350-line CGA territory */
+ if (!self->cga.linepos)
+ {
+ self->cga.vidtime += self->cga.dispofftime;
+ self->cga.cgastat |= 1;
+ self->cga.linepos = 1;
+ oldsc = self->cga.sc;
+ if ((self->cga.crtc[8] & 3) == 3)
+ self->cga.sc = ((self->cga.sc << 1) + self->cga.oddeven) & 7;
+ if (self->cga.cgadispon)
+ {
+ if (self->cga.displine < self->cga.firstline)
+ {
+ self->cga.firstline = self->cga.displine;
+ video_wait_for_buffer();
+// printf("Firstline %i\n",firstline);
+ }
+ self->cga.lastline = self->cga.displine;
+
+ cols[0] = (self->cga.cgacol & 15);
+
+ for (c = 0; c < 8; c++)
+ {
+ ((uint32_t *)buffer32->line[self->cga.displine])[c] = cols[0];
+ if (self->cga.cgamode & 1)
+ ((uint32_t *)buffer32->line[self->cga.displine])[c + (self->cga.crtc[1] << 3) + 8] = cols[0];
+ else
+ ((uint32_t *)buffer32->line[self->cga.displine])[c + (self->cga.crtc[1] << 4) + 8] = cols[0];
+ }
+ if (self->cga.cgamode & 1)
+ {
+ for (x = 0; x < self->cga.crtc[1]; x++)
+ {
+ chr = self->cga.charbuffer[x << 1];
+ attr = self->cga.charbuffer[(x << 1) + 1];
+ drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
+ if (self->flags) {
+ underline = 0;
+ blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+ }
+ if (self->flags && (self->cga.cgamode & 0x80))
+ {
+ cols[0] = mdaattr[attr][blink][0];
+ cols[1] = mdaattr[attr][blink][1];
+ if (self->cga.sc == 12 && (attr & 7) == 1) underline = 1;
+ }
+ else if (self->cga.cgamode & 0x20)
+ {
+ cols[1] = (attr & 15) + 16;
+ cols[0] = ((attr >> 4) & 7) + 16;
+ if (self->flags) {
+ if (blink)
+ cols[1] = cols[0];
+ } else {
+ if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor)
+ cols[1] = cols[0];
+ }
+ }
+ else
+ {
+ cols[1] = (attr & 15) + 16;
+ cols[0] = (attr >> 4) + 16;
+ }
+ if (self->flags && underline)
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = mdaattr[attr][blink][1];
+ }
+ else if (drawcursor)
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 0xffffff;
+ }
+ else
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 3) + c + 8] = cols[(fontdatm[chr][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
+ }
+ self->cga.ma++;
+ }
+ }
+ else
+ {
+ for (x = 0; x < self->cga.crtc[1]; x++)
+ {
+ chr = self->cga.vram[((self->cga.ma << 1) & 0x3fff)];
+ attr = self->cga.vram[(((self->cga.ma << 1) + 1) & 0x3fff)];
+ drawcursor = ((self->cga.ma == ca) && self->cga.con && self->cga.cursoron);
+ if (self->flags) {
+ underline = 0;
+ blink = ((self->cga.cgablink & 8) && (self->cga.cgamode & 0x20) && (attr & 0x80) && !drawcursor);
+ }
+ if (self->flags && (self->cga.cgamode & 0x80))
+ {
+ cols[0] = mdaattr[attr][blink][0];
+ cols[1] = mdaattr[attr][blink][1];
+ if (self->cga.sc == 12 && (attr & 7) == 1) underline = 1;
+ }
+ else if (self->cga.cgamode & 0x20)
+ {
+ cols[1] = (attr & 15) + 16;
+ cols[0] = ((attr >> 4) & 7) + 16;
+ if (self->flags) {
+ if (blink)
+ cols[1] = cols[0];
+ } else {
+ if ((self->cga.cgablink & 8) && (attr & 0x80) && !self->cga.drawcursor)
+ cols[1] = cols[0];
+ }
+ }
+ else
+ {
+ cols[1] = (attr & 15) + 16;
+ cols[0] = (attr >> 4) + 16;
+ }
+ self->cga.ma++;
+ if (self->flags && underline)
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 8] =
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 9] = mdaattr[attr][blink][1];
+ }
+ else if (drawcursor)
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4)+(c << 1) + 8] =
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0] ^ 15;
+ }
+ else
+ {
+ for (c = 0; c < 8; c++)
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 8] =
+ ((uint32_t *)buffer32->line[self->cga.displine])[(x << 4) + (c << 1) + 1 + 8] = cols[(fontdatm[chr][self->cga.sc & 15] & (1 << (c ^ 7))) ? 1 : 0];
+ }
+ }
+ }
+ }
+ else
+ {
+ cols[0] = (self->cga.cgacol & 15) + 16;
+ if (self->cga.cgamode & 1) hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 3) + 16, cols[0]);
+ else hline(buffer32, 0, self->cga.displine, (self->cga.crtc[1] << 4) + 16, cols[0]);
+ }
+
+ if (self->cga.cgamode & 1) x = (self->cga.crtc[1] << 3) + 16;
+ else x = (self->cga.crtc[1] << 4) + 16;
+
+ if (self->cga.composite)
+ {
+ for (c = 0; c < x; c++)
+ buffer32->line[self->cga.displine][c] = ((uint32_t *)buffer32->line[self->cga.displine])[c] & 0xf;
+
+ if (self->flags)
+ Composite_Process(self->cga.cgamode & 0x7F, 0, x >> 2, buffer32->line[self->cga.displine]);
+ else
+ Composite_Process(self->cga.cgamode, 0, x >> 2, buffer32->line[self->cga.displine]);
+ }
+ else
+ {
+ for (c = 0; c < x; c++)
+ buffer->line[self->cga.displine][c] = ((uint32_t *)buffer32->line[self->cga.displine])[c];
+ }
+
+ self->cga.sc = oldsc;
+ if (self->cga.vc == self->cga.crtc[7] && !self->cga.sc)
+ self->cga.cgastat |= 8;
+ self->cga.displine++;
+ if (self->cga.displine >= 500)
+ self->cga.displine = 0;
+ }
+ else
+ {
+ self->cga.vidtime += self->cga.dispontime;
+ self->cga.linepos = 0;
+ if (self->cga.vsynctime)
+ {
+ self->cga.vsynctime--;
+ if (!self->cga.vsynctime)
+ self->cga.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)))
+ {
+ self->cga.con = 0;
+ self->cga.coff = 1;
+ }
+ if ((self->cga.crtc[8] & 3) == 3 && self->cga.sc == (self->cga.crtc[9] >> 1))
+ self->cga.maback = self->cga.ma;
+ if (self->cga.vadj)
+ {
+ self->cga.sc++;
+ self->cga.sc &= 31;
+ self->cga.ma = self->cga.maback;
+ self->cga.vadj--;
+ if (!self->cga.vadj)
+ {
+ self->cga.cgadispon = 1;
+ self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff;
+ self->cga.sc = 0;
+ }
+ }
+ else if (self->cga.sc == self->cga.crtc[9])
+ {
+ self->cga.maback = self->cga.ma;
+ self->cga.sc = 0;
+ oldvc = self->cga.vc;
+ self->cga.vc++;
+ self->cga.vc &= 127;
+
+ if (self->cga.vc == self->cga.crtc[6])
+ self->cga.cgadispon = 0;
+
+ if (oldvc == self->cga.crtc[4])
+ {
+ self->cga.vc = 0;
+ self->cga.vadj = self->cga.crtc[5];
+ if (!self->cga.vadj) self->cga.cgadispon = 1;
+ if (!self->cga.vadj) self->cga.ma = self->cga.maback = (self->cga.crtc[13] | (self->cga.crtc[12] << 8)) & 0x3fff;
+ if ((self->cga.crtc[10] & 0x60) == 0x20) self->cga.cursoron = 0;
+ else self->cga.cursoron = self->cga.cgablink & 8;
+ }
+
+ if (self->cga.vc == self->cga.crtc[7])
+ {
+ self->cga.cgadispon = 0;
+ self->cga.displine = 0;
+ self->cga.vsynctime = 16;
+ if (self->cga.crtc[7])
+ {
+// printf("Lastline %i Firstline %i %i\n",self->cga.lastline,self->cga.firstline,self->cga.lastline-self->cga.firstline);
+
+ if (self->cga.cgamode & 1) x = (self->cga.crtc[1] << 3);
+ else x = (self->cga.crtc[1] << 4);
+ self->cga.lastline++;
+ if (x != xsize || (self->cga.lastline - self->cga.firstline) != ysize)
+ {
+ xsize = x;
+ ysize = self->cga.lastline - self->cga.firstline;
+// printf("Resize to %i,%i - R1 %i\n",xsize,ysize,self->cga.crtc[1]);
+
+ if (xsize < 64) xsize = 656;
+ if (ysize < 32) ysize = 200;
+ set_screen_size(xsize, ysize);
+ }
+
+ if (self->cga.composite)
+ video_blit_memtoscreen(8, self->cga.firstline, 0, ysize, xsize, ysize);
+ else
+ video_blit_memtoscreen_8(8, self->cga.firstline, 0, ysize, xsize, ysize);
+ frames++;
+
+ video_res_x = xsize - 16;
+ video_res_y = ysize;
+ if (self->cga.cgamode & 1)
+ {
+ video_res_x /= 8;
+ video_res_y /= self->cga.crtc[9] + 1;
+ video_bpp = 0;
+ }
+ else if (!(self->cga.cgamode & 2))
+ {
+ video_res_x /= 16;
+ video_res_y /= self->cga.crtc[9] + 1;
+ video_bpp = 0;
+ }
+ else if (!(self->cga.cgamode & 16))
+ {
+ video_res_x /= 2;
+ video_bpp = 2;
+ }
+ else
+ {
+ video_bpp = 1;
+ }
+ }
+ self->cga.firstline = 1000;
+ self->cga.lastline = 0;
+ self->cga.cgablink++;
+ self->cga.oddeven ^= 1;
+ }
+ }
+ else
+ {
+ self->cga.sc++;
+ self->cga.sc &= 31;
+ self->cga.ma = self->cga.maback;
+ }
+ if (self->cga.cgadispon)
+ self->cga.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))))
+ self->cga.con = 1;
+ if (self->cga.cgadispon && (self->cga.cgamode & 1))
+ {
+ for (x = 0; x < (self->cga.crtc[1] << 1); x++)
+ self->cga.charbuffer[x] = self->cga.vram[(((self->cga.ma << 1) + x) & 0x3fff)];
+ }
+ }
+
+}
+
+void *compaq_cga_init(device_t *info)
+{
+ int display_type;
+ int c;
+ compaq_cga_t *self = malloc(sizeof(compaq_cga_t));
+ memset(self, 0, sizeof(compaq_cga_t));
+
+ display_type = device_get_config_int("display_type");
+ self->cga.composite = (display_type != CGA_RGB);
+ self->cga.revision = device_get_config_int("composite_type");
+ self->cga.snow_enabled = device_get_config_int("snow_enabled");
+
+ self->cga.vram = malloc(0x4000);
+
+ cga_comp_init(self->cga.revision);
+ timer_add(compaq_cga_poll, &self->cga.vidtime, TIMER_ALWAYS_ENABLED, self);
+ mem_mapping_add(&self->cga.mapping, 0xb8000, 0x08000, cga_read, NULL, NULL, cga_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, self);
+ io_sethandler(0x03d0, 0x0010, cga_in, NULL, NULL, cga_out, NULL, NULL, self);
+
+ if (info->local) {
+ for (c = 0; c < 256; c++) {
+ mdaattr[c][0][0] = mdaattr[c][1][0] = mdaattr[c][1][1] = 16;
+ if (c & 8) mdaattr[c][0][1] = 15 + 16;
+ else mdaattr[c][0][1] = 7 + 16;
+ }
+ mdaattr[0x70][0][1] = 16;
+ mdaattr[0x70][0][0] = mdaattr[0x70][1][0] = mdaattr[0x70][1][1] = 16 + 15;
+ mdaattr[0xF0][0][1] = 16;
+ mdaattr[0xF0][0][0] = mdaattr[0xF0][1][0] = mdaattr[0xF0][1][1] = 16 + 15;
+ mdaattr[0x78][0][1] = 16 + 7;
+ mdaattr[0x78][0][0] = mdaattr[0x78][1][0] = mdaattr[0x78][1][1] = 16 + 15;
+ mdaattr[0xF8][0][1] = 16 + 7;
+ mdaattr[0xF8][0][0] = mdaattr[0xF8][1][0] = mdaattr[0xF8][1][1] = 16 + 15;
+ mdaattr[0x00][0][1] = mdaattr[0x00][1][1] = 16;
+ mdaattr[0x08][0][1] = mdaattr[0x08][1][1] = 16;
+ mdaattr[0x80][0][1] = mdaattr[0x80][1][1] = 16;
+ mdaattr[0x88][0][1] = mdaattr[0x88][1][1] = 16;
+ }
+
+ self->flags = info->local;
+
+ overscan_x = overscan_y = 16;
+
+ self->cga.rgb_type = device_get_config_int("rgb_type");
+ cga_palette = (self->cga.rgb_type << 1);
+ cgapal_rebuild();
+
+ return self;
+}
+
+void compaq_cga_close(void *p)
+{
+ compaq_cga_t *self = (compaq_cga_t *)p;
+
+ free(self->cga.vram);
+ free(self);
+}
+
+void compaq_cga_speed_changed(void *p)
+{
+ compaq_cga_t *self = (compaq_cga_t *)p;
+
+ if (self->cga.crtc[9] == 13) /* Character height */
+ {
+ compaq_cga_recalctimings(self);
+ }
+ else
+ {
+ cga_recalctimings(&self->cga);
+ }
+}
+
+extern device_config_t cga_config[];
+
+device_t compaq_cga_device =
+{
+ "Compaq CGA",
+ DEVICE_ISA, 0,
+ compaq_cga_init,
+ compaq_cga_close,
+ NULL,
+ NULL,
+ compaq_cga_speed_changed,
+ NULL,
+ NULL,
+ cga_config
+};
+
+device_t compaq_cga_2_device =
+{
+ "Compaq CGA 2",
+ DEVICE_ISA, 1,
+ compaq_cga_init,
+ compaq_cga_close,
+ NULL,
+ NULL,
+ compaq_cga_speed_changed,
+ NULL,
+ NULL,
+ cga_config
+};
diff --git a/src/video/vid_compaq_cga.h b/src/video/vid_compaq_cga.h
new file mode 100644
index 000000000..b00e048ca
--- /dev/null
+++ b/src/video/vid_compaq_cga.h
@@ -0,0 +1,11 @@
+#ifndef VIDEO_COMPAQ_CGA_H
+# define VIDEO_COMPAQ_CGA_H
+
+
+#ifdef EMU_DEVICE_H
+extern device_t compaq_cga_device;
+extern device_t compaq_cga_2_device;
+#endif
+
+
+#endif /*VIDEO_COMPAQ_CGA_H*/
diff --git a/src/video/vid_table.c b/src/video/vid_table.c
index f1632239c..704c9ee3f 100644
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -8,7 +8,7 @@
*
* Define all known video cards.
*
- * Version: @(#)vid_table.c 1.0.6 2017/11/05
+ * Version: @(#)vid_table.c 1.0.7 2017/12/29
*
* Authors: Miran Grca,
* Fred N. van Kempen,
@@ -41,6 +41,7 @@
# include "vid_cl_gd.h"
# endif
#endif
+#include "vid_compaq_cga.h"
#include "vid_ega.h"
#include "vid_et4000.h"
#include "vid_et4000w32.h"
@@ -103,6 +104,8 @@ video_cards[] = {
{ "[ISA] Cirrus Logic CL-GD5440", "cl_gd5440", &gd5440_device, GFX_CL_GD5440 },
#endif
{ "[ISA] Compaq ATI VGA Wonder XL (ATI-28800-5)","compaq_ati28800", &compaq_ati28800_device, GFX_VGAWONDERXL },
+ { "[ISA] Compaq CGA", "compaq_cga", &compaq_cga_device, GFX_COMPAQ_CGA },
+ { "[ISA] Compaq CGA 2", "compaq_cga_2", &compaq_cga_2_device, GFX_COMPAQ_CGA_2 },
{ "[ISA] Compaq EGA", "compaq_ega", &cpqega_device, GFX_COMPAQ_EGA },
{ "[ISA] EGA", "ega", &ega_device, GFX_EGA },
{ "[ISA] Hercules", "hercules", &hercules_device, GFX_HERCULES },
diff --git a/src/video/video.h b/src/video/video.h
index aff3e3db3..1e0a83b28 100644
--- a/src/video/video.h
+++ b/src/video/video.h
@@ -8,7 +8,7 @@
*
* Definitions for the video controller module.
*
- * Version: @(#)video.h 1.0.5 2017/11/25
+ * Version: @(#)video.h 1.0.6 2017/12/29
*
* Authors: Sarah Walker,
* Miran Grca,
@@ -92,6 +92,8 @@ enum {
GFX_CL_GD5436, /* Cirrus Logic CL-GD5436 */
GFX_CL_GD5440, /* Cirrus Logic CL-GD5440 */
GFX_TICF62011, /* TI CF62011 */
+ GFX_COMPAQ_CGA, /* Compaq CGA */
+ GFX_COMPAQ_CGA_2, /* Compaq CGA 2 */
GFX_MAX
};
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index b81113b30..f27f3d3e7 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
-# Version: @(#)Makefile.mingw 1.0.85 2017/12/25
+# Version: @(#)Makefile.mingw 1.0.86 2017/12/29
#
# Authors: Miran Grca,
# Fred N. van Kempen,
@@ -77,6 +77,9 @@ endif
ifndef OPENAL
OPENAL := y
endif
+ifndef PORTABLE3
+PORTABLE3 := n
+endif
ifndef FLUIDSYNTH
FLUIDSYNTH := y
endif
@@ -108,6 +111,7 @@ GREENB := y
NE1000 := y
NV_RIVA := y
PAS16 := y
+PORTABLE3 := y
VNC := y
endif
@@ -428,7 +432,9 @@ SNDOBJ := sound.o \
VIDOBJ := video.o \
vid_table.o \
- vid_cga.o vid_cga_comp.o vid_mda.o \
+ vid_cga.o vid_cga_comp.o \
+ vid_compaq_cga.o \
+ vid_mda.o \
vid_ega.o vid_ega_render.o \
vid_vga.o vid_svga.o vid_svga_render.o \
vid_hercules.o vid_herculesplus.o vid_incolor.o \