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

EGA and JEGA: Implement some missing SuperEGA stuff and make the JEGA properly set the EGA type to SuperEGA, fixes #5370.

Browse Source
This commit is contained in:
OBattler
2025-03-22 19:45:32 +01:00
parent 81141c574c
commit c3d15ef36d
3 changed files with 65 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/86box/vid_ega.h
View File

@@ -178,6 +178,7 @@ extern uint8_t ega_in(uint16_t addr, void *priv);
extern void ega_poll(void *priv); extern void ega_poll(void *priv);
extern void ega_write(uint32_t addr, uint8_t val, void *priv); extern void ega_write(uint32_t addr, uint8_t val, void *priv);
extern uint8_t ega_read(uint32_t addr, void *priv); extern uint8_t ega_read(uint32_t addr, void *priv);
extern void ega_set_type(void *priv, uint32_t local);
extern int firstline_draw; extern int firstline_draw;
extern int lastline_draw; extern int lastline_draw;

69
src/video/vid_ega.c
View File

@@ -67,6 +67,8 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
ega_t *ega = (ega_t *) priv; ega_t *ega = (ega_t *) priv;
uint8_t o; uint8_t o;
uint8_t old; uint8_t old;
uint8_t gdcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x0f;
uint8_t crtcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x1f;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1)) if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
addr ^= 0x60; addr ^= 0x60;
@@ -200,8 +202,8 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
ega->gdcaddr = val; ega->gdcaddr = val;
break; break;
case 0x3cf: case 0x3cf:
ega->gdcreg[ega->gdcaddr & 15] = val; ega->gdcreg[ega->gdcaddr & gdcmask] = val;
switch (ega->gdcaddr & 15) { switch (ega->gdcaddr & gdcmask) {
case 2: case 2:
ega->colourcompare = val; ega->colourcompare = val;
break; break;
@@ -238,6 +240,19 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
ega->colournocare = val; ega->colournocare = val;
break; break;
case 0xf8:
ega->la = val;
break;
case 0xf9:
ega->lb = val;
break;
case 0xfa:
ega->lc = val;
break;
case 0xfb:
ega->ld = val;
break;
default: default:
break; break;
} }
@@ -247,7 +262,7 @@ ega_out(uint16_t addr, uint8_t val, void *priv)
if (ega->chipset) if (ega->chipset)
ega->crtcreg = val & 0x3f; ega->crtcreg = val & 0x3f;
else else
ega->crtcreg = val & 0x1f; ega->crtcreg = val & crtcmask;
return; return;
case 0x3d1: case 0x3d1:
case 0x3d5: case 0x3d5:
@@ -286,7 +301,8 @@ uint8_t
ega_in(uint16_t addr, void *priv) ega_in(uint16_t addr, void *priv)
{ {
ega_t *ega = (ega_t *) priv; ega_t *ega = (ega_t *) priv;
uint8_t ret = 0xff; uint8_t gdcmask = (ega->actual_type == EGA_SUPEREGA) ? 0xff : 0x0f;
uint8_t ret = 0xff;
if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1)) if (((addr & 0xfff0) == 0x3d0 || (addr & 0xfff0) == 0x3b0) && !(ega->miscout & 1))
addr ^= 0x60; addr ^= 0x60;
@@ -347,8 +363,25 @@ ega_in(uint16_t addr, void *priv)
ret = ega->gdcaddr; ret = ega->gdcaddr;
break; break;
case 0x3cf: case 0x3cf:
if (ega_type == EGA_TYPE_OTHER) if (ega_type == EGA_TYPE_OTHER) {
ret = ega->gdcreg[ega->gdcaddr & 0xf]; switch (ega->gdcaddr & gdcmask) {
default:
ret = ega->gdcreg[ega->gdcaddr & gdcmask];
break;
case 0xf8:
ret = ega->la;
break;
case 0xf9:
ret = ega->lb;
break;
case 0xfa:
ret = ega->lc;
break;
case 0xfb:
ret = ega->ld;
break;
}
}
break; break;
case 0x3d0: case 0x3d0:
case 0x3d4: case 0x3d4:
@@ -1428,6 +1461,30 @@ ega_init(ega_t *ega, int monitor_type, int is_mono)
timer_add(&ega->dot_timer, ega_dot_poll, ega, 1); timer_add(&ega->dot_timer, ega_dot_poll, ega, 1);
} }
void
ega_set_type(void *priv, uint32_t local)
{
ega_t *ega = (ega_t *) priv;
if ((local == EGA_IBM) || (local == EGA_ISKRA) || (local == EGA_TSENG))
ega_type = EGA_TYPE_IBM;
else if (local == EGA_COMPAQ)
ega_type = EGA_TYPE_COMPAQ;
else
ega_type = EGA_TYPE_OTHER;
ega->actual_type = local;
ega->chipset = 0;
switch (local) {
default:
break;
case EGA_ATI800P:
ega->chipset = 1;
break;
}
}
static void * static void *
ega_standalone_init(const device_t *info) ega_standalone_init(const device_t *info)
{ {

2
src/video/vid_jega.c
View File

@@ -632,7 +632,7 @@ jega_init(const device_t *info)
video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega); video_inform(VIDEO_FLAG_TYPE_SPECIAL, &timing_ega);
jega->pallook = pallook64; jega->pallook = pallook64;
ega_init(&jega->ega, 9, 0); ega_init(&jega->ega, 9, 0);
jega->ega.actual_type = EGA_SUPEREGA; ega_set_type(&jega->ega, EGA_SUPEREGA);
jega->ega.priv_parent = jega; jega->ega.priv_parent = jega;
mem_mapping_add(&jega->ega.mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, &jega->ega); mem_mapping_add(&jega->ega.mapping, 0xa0000, 0x20000, ega_read, NULL, NULL, ega_write, NULL, NULL, NULL, MEM_MAPPING_EXTERNAL, &jega->ega);