claunia/VARCem
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved Codec ioport handling

Browse Source 
Some games relocates CODEC Ioport (ie. Hardball 4).
This commit is contained in:
Altheos
2018-12-17 11:56:36 +01:00
parent 06861bece0
commit 6136e214e9
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/sound/snd_cs423x.c
View File

@@ -195,8 +195,7 @@ static void cs423x_poll(void *p)
cs423x_update(cs423x); cs423x_update(cs423x);
if (cs423x->enable) if (cs423x->enable) {
{
int32_t temp; int32_t temp;
if (!(cs423x->mode2)) { if (!(cs423x->mode2)) {
@@ -273,11 +272,10 @@ static void cs423x_poll(void *p)
cs423x->count = cs423x->regs[15] | (cs423x->regs[14] << 8); cs423x->count = cs423x->regs[15] | (cs423x->regs[14] << 8);
if (!(cs423x->status & 0x01)) { if (!(cs423x->status & 0x01)) {
cs423x->status |= 0x01; cs423x->status |= 0x01;
if (cs423x->regs[0xa] & 2) if (cs423x->regs[10] & 2)
picint(1 << cs423x->irq); picint(1 << cs423x->irq);
} }
} }
cs423x->count--; cs423x->count--;
} }
else { else {

27
src/devices/sound/snd_gus.c
View File

@@ -246,6 +246,7 @@ gus_write(uint16_t addr, uint8_t val, void *priv)
gus_t *dev = (gus_t *)priv; gus_t *dev = (gus_t *)priv;
int c, d; int c, d;
int old; int old;
uint16_t ioport;
if (dev->latch_enable && addr != 0x24b) if (dev->latch_enable && addr != 0x24b)
dev->latch_enable = 0; dev->latch_enable = 0;
@@ -668,14 +669,19 @@ gus_write(uint16_t addr, uint8_t val, void *priv)
dev->reg_ctrl = val; dev->reg_ctrl = val;
break; break;
case 0x346: case 0x346: case 0x746:
if (dev->dma >= 4) if (dev->dma >= 4)
val |= 0x30; val |= 0x30;
dev->max_ctrl = (val >> 6) & 1; dev->max_ctrl = (val >> 6) & 1;
pclog(0, "Enable CS4231 %X, val %02X\n", dev->max_ctrl, val);
if (val & 0x40) { if (val & 0x40) {
if ((val & 0xF) != ((addr >> 4) & 0xF)) if ((val & 0xF) != ((addr >> 4) & 0xF)) { /* Fix me : why is DOS application attempting to relocate the CODEC ? */
pclog(0, "DOS application is attempting to relocate the CS4231 codec\n"); ioport = 0x30c | ((addr >> 4) & 0xf);
io_removehandler(ioport, 4,
cs423x_read, NULL, NULL, cs423x_write, NULL, NULL, &dev->cs423x);
ioport = 0x30c | ((val & 0xf) << 4);
io_sethandler(ioport, 4,
cs423x_read, NULL, NULL, cs423x_write, NULL, NULL, &dev->cs423x);
}
} }
break; break;
} }
@@ -825,11 +831,11 @@ gus_read(uint16_t addr, void *priv)
} }
break; break;
case 0x346: case 0x346: case 0x746:
if (dev->max_ctrl) if (dev->max_ctrl)
val = 0x0a; /* GUS MAX */ val = 0x0a; /* GUS MAX */
else else
val = 0xff; val = 0xff; /*Pre 3.7 - no mixer*/
break; break;
case 0x347: /*DRAM access*/ case 0x347: /*DRAM access*/
@@ -841,13 +847,6 @@ gus_read(uint16_t addr, void *priv)
val = 0x00; val = 0x00;
break; break;
case 0x746: /*Revision level*/
if (dev->max_ctrl)
val = 0x0a; /* GUS MAX */
else
val = 0xff; /*Pre 3.7 - no mixer*/
break;
case 0x24b: case 0x24b:
switch (dev->reg_ctrl & 0x07) { switch (dev->reg_ctrl & 0x07) {
case 1: case 1:
@@ -1243,7 +1242,7 @@ gus_max_init(const device_t *info)
dev->t1l = dev->t2l = 0xff; dev->t1l = dev->t2l = 0xff;
cs423x_init(&dev->cs423x); cs423x_init(&dev->cs423x);
cs423x_setirq(&dev->cs423x, 7); cs423x_setirq(&dev->cs423x, 5); /*Default irq and dma from GUS SDK*/
cs423x_setdma(&dev->cs423x, 3); cs423x_setdma(&dev->cs423x, 3);
io_sethandler(0x0240, 16, io_sethandler(0x0240, 16,