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

Fixed the warnings in the SC1184x RAMDAC code.

Browse Source
This commit is contained in:
OBattler
2022-04-14 00:18:58 +02:00
parent 1f144f1885
commit bd8b58b5e9
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/video/vid_sc1148x_ramdac.c
View File

@@ -42,12 +42,11 @@ void
sc1148x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga) sc1148x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga)
{ {
sc1148x_ramdac_t *ramdac = (sc1148x_ramdac_t *) p; sc1148x_ramdac_t *ramdac = (sc1148x_ramdac_t *) p;
uint8_t rs = (addr & 0x03); uint8_t rs = (addr & 0x03) | ((!!rs2) << 2);
rs |= ((!!rs2) << 2); int oldbpp = 0;
int oldbpp = 0;
switch (addr) { switch (rs) {
case 0x3c6: case 2: case 6:
switch (ramdac->state) { switch (ramdac->state) {
case 4: case 4:
ramdac->state = 0; ramdac->state = 0;
@@ -84,8 +83,7 @@ sc1148x_ramdac_out(uint16_t addr, int rs2, uint8_t val, void *p, svga_t *svga)
} }
break; break;
case 0x3c7: case 0x3c8: default:
case 0x3c9:
ramdac->state = 0; ramdac->state = 0;
svga_out(addr, val, svga); svga_out(addr, val, svga);
break; break;
@@ -97,12 +95,10 @@ uint8_t
sc1148x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga) sc1148x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga)
{ {
sc1148x_ramdac_t *ramdac = (sc1148x_ramdac_t *) p; sc1148x_ramdac_t *ramdac = (sc1148x_ramdac_t *) p;
uint8_t ret = 0xff; uint8_t ret = 0xff, rs = (addr & 0x03) | ((!!rs2) << 2);
uint8_t rs = (addr & 0x03);
rs |= ((!!rs2) << 2);
switch (addr) { switch (rs) {
case 0x3c6: case 2: case 6:
switch (ramdac->state) { switch (ramdac->state) {
case 1: case 1:
case 2: case 3: case 2: case 3:
@@ -120,8 +116,7 @@ sc1148x_ramdac_in(uint16_t addr, int rs2, void *p, svga_t *svga)
} }
break; break;
case 0x3c7: case 0x3c8: default:
case 0x3c9:
ret = svga_in(addr, svga); ret = svga_in(addr, svga);
ramdac->state = 0; ramdac->state = 0;
break; break;