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

Improved passing of scan codes to the emulated keyboards;

Browse Source 
Fixed Sound Blaster 16 and earlier CD-ROM volume registers (and made them no longer default to 0);
Serial mouse now resets the FIFO before sending the ID, fixes mouse detection after clipping and moving the mouse;
Rewritten CD-ROM and SCSI disk Mode Select handling and changed things regarding Mode Sense as well, also fixes emulator segmentation faults when anything attempts to do a Mode Select;
Fixed the Microsoft InPort mouse emulation (used the Bochs code as reference for the polling/state update code), now it actually moves;
The PCjr initialization now sets the XT scan code table, makes the keyboard actually work on the PCjr again;
Several bugfixes regarding the Read CD commands, fixes CD Audio in digital mode on Windows ME;
Finally properly fixed the regular CD Audio MSF/LBA conversion mess;
Applied all applicable PCem commits.
This commit is contained in:
OBattler
2018-01-13 22:56:13 +01:00
parent b4aff71a6b
commit 845c8ed4bd
29 changed files with 2127 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/sound/snd_sb.c
View File

@@ -551,7 +551,7 @@ void sb_ct1345_mixer_write(uint16_t addr, uint8_t val, void *p)
mixer->regs[0x04] = (7 << 5) | (7 << 1);
mixer->regs[0x22] = (7 << 5) | (7 << 1);
mixer->regs[0x26] = (7 << 5) | (7 << 1);
mixer->regs[0x28] = (0 << 5) | (0 << 1);
mixer->regs[0x28] = (7 << 5) | (7 << 1);
mixer->regs[0x2E] = (0 << 5) | (0 << 1);
sb_dsp_set_stereo(&sb->dsp, mixer->regs[0x0E] & 2);
}
@@ -561,11 +561,11 @@ void sb_ct1345_mixer_write(uint16_t addr, uint8_t val, void *p)
switch (mixer->index)
{
/* Compatibility: chain registers 0x02 and 0x22 as well as 0x06 and 0x26 */
case 0x02: case 0x06:
case 0x02: case 0x06: case 0x08:
mixer->regs[mixer->index+0x20]=((val&0xE) << 4)|(val&0xE) << 4;
break;
case 0x22: case 0x26:
case 0x22: case 0x26: case 0x28:
mixer->regs[mixer->index-0x20]=(val&0xE);
break;
@@ -575,7 +575,7 @@ void sb_ct1345_mixer_write(uint16_t addr, uint8_t val, void *p)
break;
case 0x00: case 0x04: case 0x0a: case 0x0c: case 0x0e:
case 0x28: case 0x2e:
case 0x2e:
break;
@@ -681,12 +681,13 @@ void sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *p)
mixer->regs[0x33]=31 << 3;
mixer->regs[0x34]=31 << 3;
mixer->regs[0x35]=31 << 3;
mixer->regs[0x36]=0 << 3;
mixer->regs[0x37]=0 << 3;
mixer->regs[0x36]=31 << 3;
mixer->regs[0x37]=31 << 3;
mixer->regs[0x38]=0 << 3;
mixer->regs[0x39]=0 << 3;
mixer->regs[0x3A]=0 << 3;
mixer->regs[0x3B]=0 << 6;
mixer->regs[0x3C] = OUTPUT_MIC|OUTPUT_CD_R|OUTPUT_CD_L|OUTPUT_LINE_R|OUTPUT_LINE_L;
mixer->regs[0x3D] = INPUT_MIC|INPUT_CD_L|INPUT_LINE_L|INPUT_MIDI_L;
@@ -723,13 +724,13 @@ void sb_ct1745_mixer_write(uint16_t addr, uint8_t val, void *p)
mixer->regs[0x36] = (mixer->regs[0x28] & 0xF0) | 0x8;
mixer->regs[0x37] = ((mixer->regs[0x28] & 0xf) << 4) | 0x8;
break;
case 0x0A:
mixer->regs[0x3A] = (mixer->regs[0x0A]*3)+10;
break;
case 0x2E:
mixer->regs[0x38] = (mixer->regs[0x2E] & 0xF0) | 0x8;
mixer->regs[0x39] = ((mixer->regs[0x2E] & 0xf) << 4) | 0x8;
break;
case 0x0A:
mixer->regs[0x3A] = (mixer->regs[0x0A]*3)+10;
break;
/*
(DSP 4.xx feature) The Interrupt Setup register, addressed as register 80h on the Mixer register map, is used to configure or determine the Interrupt request line. The DMA setup register, addressed as register 81h on the Mixer register map, is used to configure or determine the DMA channels.
@@ -813,7 +814,7 @@ uint8_t sb_ct1745_mixer_read(uint16_t addr, void *p)
case 0x04:
return ((mixer->regs[0x33] >> 4) & 0x0f) | (mixer->regs[0x32] & 0xf0);
case 0x0a:
return (mixer->regs[0x2a] - 10) / 3;
return (mixer->regs[0x3a] - 10) / 3;
case 0x22:
return ((mixer->regs[0x31] >> 4) & 0x0f) | (mixer->regs[0x30] & 0xf0);
case 0x26:

6
src/sound/snd_sb_dsp.c
View File

@@ -719,7 +719,11 @@ uint8_t sb_read(uint16_t a, void *priv)
// pclog("SB read %02X\n",sbreaddat);
return dsp->sbreaddat;
case 0xC: /*Write data ready*/
if (dsp->wb_full)
if (dsp->sb_8_enable || dsp->sb_type >= SB16 )
dsp->busy_count = (dsp->busy_count + 1) & 15;
else
dsp->busy_count = 0;
if (dsp->wb_full || (dsp->busy_count & 8))
{
dsp->wb_full = dsp->wb_time;
return 0xff;

2
src/sound/snd_sb_dsp.h
View File

@@ -62,6 +62,8 @@ typedef struct sb_dsp_t
int64_t wb_time, wb_full;
int busy_count;
int record_pos_read;
int record_pos_write;
int16_t record_buffer[0xFFFF];