mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-25 04:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge branch 'master' into pc98x1

Browse Source
This commit is contained in:
TC1995
2024-09-17 00:31:02 +02:00
parent 7b093b33c1 76751c611f
commit 70329ec403
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/device/mouse_microtouch_touchscreen.c
View File

@@ -240,7 +240,7 @@ mtouch_write(serial_t *serial, void *priv, uint8_t data)
static int
mtouch_prepare_transmit(void *priv)
{
char buffer[10];
char buffer[16];
mouse_microtouch_t *dev = (mouse_microtouch_t *) priv;
double abs_x = dev->abs_x;

4
src/sound/snd_sb_dsp.c
View File

@@ -1983,10 +1983,8 @@ sb_read(uint16_t a, void *priv)
else
ret = (dsp->sb_read_rp == dsp->sb_read_wp) ? 0x7f : 0xff;
}
if (dsp->state == DSP_S_RESET_WAIT) {
ret &= 0x7f;
if (dsp->state == DSP_S_RESET_WAIT)
dsp->state = DSP_S_NORMAL;
}
break;
case 0xF: /* 16-bit ack */
if (IS_NOT_ESS(dsp)) {