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

Merge branch 'master' of https://github.com/OBattler/86Box

Browse Source
This commit is contained in:
OBattler
2017-11-23 21:32:44 +01:00
parent 7095f329de ea1fdc7c66
commit fecc07b06e
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sound/snd_mpu401.c
View File

@@ -169,7 +169,6 @@ static void MPU401_WriteCommand(mpu_t *mpu, uint8_t val)
if (mpu->state.reset) if (mpu->state.reset)
{ {
mpu->state.cmd_pending=val+1; mpu->state.cmd_pending=val+1;
return;
} }
if (val<=0x2f) if (val<=0x2f)
@@ -678,9 +677,8 @@ static uint8_t mpu401_read(uint16_t addr, void *p)
break; break;
case 1: //Read Status case 1: //Read Status
ret = 0x3f; /* Bits 6 and 7 clear */ if (mpu->state.cmd_pending) ret=STATUS_OUTPUT_NOT_READY;
if (mpu->state.cmd_pending) ret|=STATUS_OUTPUT_NOT_READY; if (!mpu->queue_used) ret=STATUS_INPUT_NOT_READY;
if (!mpu->queue_used) ret|=STATUS_INPUT_NOT_READY;
pclog("Read Status (0x331) %x\n", ret); pclog("Read Status (0x331) %x\n", ret);
break; break;
} }

2
src/video/vid_s3.c
View File

@@ -1696,6 +1696,8 @@ void s3_accel_start(int count, int cpu_input, uint32_t mix_dat, uint32_t cpu_dat
if (cpu_input/* && (s3->accel.multifunc[0xa] & 0xc0) == 0x80*/) return; if (cpu_input/* && (s3->accel.multifunc[0xa] & 0xc0) == 0x80*/) return;
if (s3->accel.sy < 0) if (s3->accel.sy < 0)
{ {
s3->accel.cur_x = s3->accel.cx;
s3->accel.cur_y = s3->accel.cy;
return; return;
} }
} }