80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed the variable's name.

Browse Source
This commit is contained in:
OBattler
2023-12-27 15:38:43 +01:00
parent a2a180ad8e
commit 2002f8e34e
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/vid_svga.h
View File

@@ -231,7 +231,7 @@ typedef struct svga_t {
uint8_t dac_status; uint8_t dac_status;
uint8_t dpms; uint8_t dpms;
uint8_t dpms_ui; uint8_t dpms_ui;
uint8_t color_4bpp; uint8_t color_2bpp;
uint8_t ksc5601_sbyte_mask; uint8_t ksc5601_sbyte_mask;
uint8_t ksc5601_udc_area_msb[2]; uint8_t ksc5601_udc_area_msb[2];

19
src/video/vid_svga.c
View File

@@ -175,7 +175,7 @@ svga_out(uint16_t addr, uint8_t val, void *priv)
o = svga->attrregs[svga->attraddr & 31]; o = svga->attrregs[svga->attraddr & 31];
svga->attrregs[svga->attraddr & 31] = val; svga->attrregs[svga->attraddr & 31] = val;
if (svga->attraddr < 16) { if (svga->attraddr < 16) {
svga->color_4bpp = (val >> 4) & 0x03; svga->color_2bpp = (val >> 4) & 0x03;
svga->fullchange = svga->monitor->mon_changeframecount; svga->fullchange = svga->monitor->mon_changeframecount;
} }
if (svga->attraddr == 0x10 || svga->attraddr == 0x14 || svga->attraddr < 0x10) { if (svga->attraddr == 0x10 || svga->attraddr == 0x14 || svga->attraddr < 0x10) {
@@ -620,7 +620,7 @@ svga_recalctimings(svga_t *svga)
svga->ma_latch = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5); svga->ma_latch = ((svga->crtc[0xc] << 8) | svga->crtc[0xd]) + ((svga->crtc[8] & 0x60) >> 5);
svga->ca_adj = 0; svga->ca_adj = 0;
svga->rowcount = svga->crtc[9] & 0x1f; svga->rowcount = svga->crtc[9] & 31;
svga->hdisp_time = svga->hdisp; svga->hdisp_time = svga->hdisp;
svga->render = svga_render_blank; svga->render = svga_render_blank;
@@ -641,26 +641,27 @@ svga_recalctimings(svga_t *svga)
svga->hdisp *= (svga->seqregs[1] & 8) ? 16 : 8; svga->hdisp *= (svga->seqregs[1] & 8) ? 16 : 8;
svga->hdisp_old = svga->hdisp; svga->hdisp_old = svga->hdisp;
if ((svga->bpp <= 8) || ((svga->gdcreg[5] & 0x60) <= 0x20)) { if ((svga->bpp <= 8) || ((svga->gdcreg[5] & 0x60) == 0x00)) {
if ((svga->gdcreg[5] & 0x60) == 0x00) { if ((svga->gdcreg[5] & 0x60) == 0x00) {
if (svga->seqregs[1] & 8) /*Low res (320)*/ if (svga->seqregs[1] & 8) /*Low res (320)*/
svga->render = svga_render_4bpp_lowres; svga->render = svga_render_4bpp_lowres;
else else
svga->render = svga_render_4bpp_highres; svga->render = svga_render_4bpp_highres;
} else if ((svga->gdcreg[5] & 0x60) == 0x20) {
if (svga->seqregs[1] & 8) /*Low res (320)*/
svga->render = svga_render_2bpp_lowres;
else
svga->render = svga_render_2bpp_highres;
} else { } else {
svga->map8 = svga->pallook; svga->map8 = svga->pallook;
if (svga->lowres) /*Low res (320)*/ if (svga->attrregs[0x10] & 0x40) /*Low res (320)*/
svga->render = svga_render_8bpp_lowres; svga->render = svga_render_8bpp_lowres;
else else
svga->render = svga_render_8bpp_highres; svga->render = svga_render_8bpp_highres;
} }
} else { } else {
switch (svga->gdcreg[5] & 0x60) { switch (svga->gdcreg[5] & 0x60) {
case 0x20: /*4 colours*/
if (svga->seqregs[1] & 8) /*Low res (320)*/
svga->render = svga_render_2bpp_lowres;
else
svga->render = svga_render_2bpp_highres;
break;
case 0x40: case 0x40:
case 0x60: /*256+ colours*/ case 0x60: /*256+ colours*/
switch (svga->bpp) { switch (svga->bpp) {