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

Fixed the fourth batch of problems.

Browse Source
This commit is contained in:
OBattler
2020-01-15 05:24:33 +01:00
parent 932ad5595a
commit e44e60c660
19 changed files with 91 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/video/vid_ati_mach64.c
View File

@@ -789,6 +789,7 @@ static void mach64_accel_write_fifo(mach64_t *mach64, uint32_t addr, uint8_t val
break;
case 0x2a4: case 0x2a5:
addr += 2;
/*FALLTHROUGH*/
case 0x2aa: case 0x2ab:
WRITE8(addr, mach64->sc_left_right, val);
break;

2
src/video/vid_et4000w32.c
View File

@@ -1247,7 +1247,7 @@ void et4000w32p_pci_write(int func, int addr, uint8_t val, void *p)
case 0x13:
et4000->linearbase &= 0x00c00000;
et4000->linearbase = (et4000->pci_regs[0x13] << 24);
et4000->linearbase |= (et4000->pci_regs[0x13] << 24);
svga->crtc[0x30] &= 3;
svga->crtc[0x30] |= ((et4000->linearbase & 0x3f000000) >> 22);
et4000w32p_recalcmapping(et4000);

2
src/video/vid_pgc.c
View File

@@ -1680,7 +1680,6 @@ pgc_wake(pgc_t *dev)
void
pgc_sleep(pgc_t *dev)
{
uint8_t *n = NULL;
pgc_log("PGC: sleeping on %i %i %i %i 0x%02x 0x%02x\n",
dev->stopped,
dev->waiting_input_fifo, dev->waiting_output_fifo,
@@ -1690,7 +1689,6 @@ pgc_sleep(pgc_t *dev)
if (dev->stopped) {
dev->waiting_input_fifo = 0;
dev->waiting_output_fifo = 0;
*n = 0;
return;
}

16
src/video/video.c
View File

@@ -920,14 +920,14 @@ loadfont(wchar_t *s, int format)
case 0: /* MDA */
for (c=0; c<256; c++)
for (d=0; d<8; d++)
fontdatm[c][d] = fgetc(f);
fontdatm[c][d] = fgetc(f) & 0xff;
for (c=0; c<256; c++)
for (d=0; d<8; d++)
fontdatm[c][d+8] = fgetc(f);
fontdatm[c][d+8] = fgetc(f) & 0xff;
(void)fseek(f, 4096+2048, SEEK_SET);
for (c=0; c<256; c++)
for (d=0; d<8; d++)
fontdat[c][d] = fgetc(f);
fontdat[c][d] = fgetc(f) & 0xff;
break;
case 1: /* PC200 */
@@ -950,19 +950,19 @@ loadfont(wchar_t *s, int format)
case 2: /* CGA */
for (c=0; c<256; c++)
for (d=0; d<8; d++)
fontdat[c][d] = fgetc(f);
fontdat[c][d] = fgetc(f) & 0xff;
break;
case 3: /* Wyse 700 */
for (c=0; c<512; c++)
for (d=0; d<32; d++)
fontdatw[c][d] = fgetc(f);
fontdatw[c][d] = fgetc(f) & 0xff;
break;
case 4: /* MDSI Genius */
for (c=0; c<256; c++)
for (d=0; d<16; d++)
fontdat8x12[c][d] = fgetc(f);
fontdat8x12[c][d] = fgetc(f) & 0xff;
break;
case 5: /* Toshiba 3100e */
@@ -1006,7 +1006,7 @@ loadfont(wchar_t *s, int format)
for (c = 0; c < 16384; c++)
{
for (d = 0; d < 32; d++)
fontdatksc5601[c].chr[d]=getc(f);
fontdatksc5601[c].chr[d]=fgetc(f) & 0xff;
}
break;
@@ -1026,7 +1026,7 @@ loadfont(wchar_t *s, int format)
case 8: /* Amstrad PC1512, Toshiba T1000/T1200 */
for (c = 0; c < 2048; c++) /* Allow up to 2048 chars */
for (d=0; d<8; d++)
fontdat[c][d] = fgetc(f);
fontdat[c][d] = fgetc(f) & 0xff;
break;
case 9: /* Image Manager 1024 native font */