ShuriZma
/
fbneo
mirror of https://github.com/finalburnneo/FBNeo.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add multi-chip support to burn_y8950.cpp and hook up in Cybertank

This commit is contained in:
Barry Harris 2012-08-11 09:51:16 +00:00
parent 89e499e1be
commit 3650b004a8
4 changed files with 118 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/burn/drv/pre90s/d_cybertnk.cpp
View File

@ -24,7 +24,7 @@ static UINT8 *DrvGfxROM2;
static UINT8 *DrvGfxROM3; static UINT8 *DrvGfxROM3;
static UINT8 *DrvGfxROM4; static UINT8 *DrvGfxROM4;
static UINT8 *DrvSndROM0; static UINT8 *DrvSndROM0;
//static UINT8 *DrvSndROM1; static UINT8 *DrvSndROM1;
static UINT8 *Drv68KRAM0; static UINT8 *Drv68KRAM0;
static UINT8 *DrvSprRAM; static UINT8 *DrvSprRAM;
static UINT8 *DrvVidRAM0; static UINT8 *DrvVidRAM0;
@ -278,12 +278,12 @@ static void __fastcall cybertnk_sound_write(UINT16 address, UINT8 data)
{ {
case 0xa000: case 0xa000:
case 0xa001: case 0xa001:
// y8950_w #0 BurnY8950Write(0, address & 1, data);
return; return;
case 0xc000: case 0xc000:
case 0xc001: case 0xc001:
BurnY8950Write(address & 1, data); BurnY8950Write(1, address & 1, data);
return; return;
} }
} }
@ -292,8 +292,8 @@ static UINT8 __fastcall cybertnk_sound_read(UINT16 address)
{ {
switch (address) switch (address)
{ {
case 0xa000: // y8950_r case 0xa000:
return rand(); // keep the z80 happy until y8950 #0 is hooked up return BurnY8950Read(0, address & 1);
case 0xa001: case 0xa001:
ZetSetIRQLine(0, ZET_IRQSTATUS_NONE); ZetSetIRQLine(0, ZET_IRQSTATUS_NONE);
@ -301,7 +301,7 @@ static UINT8 __fastcall cybertnk_sound_read(UINT16 address)
case 0xc000: case 0xc000:
case 0xc001: case 0xc001:
return BurnY8950Read(address & 1); return BurnY8950Read(1, address & 1);
} }
return 0; return 0;
@ -332,7 +332,7 @@ static INT32 MemIndex()
DrvTransTab3 = Next; Next += 0x080000 / (1 * 1024); DrvTransTab3 = Next; Next += 0x080000 / (1 * 1024);
DrvSndROM0 = Next; Next += 0x040000; DrvSndROM0 = Next; Next += 0x040000;
// DrvSndROM1 = Next; Next += 0x080000; DrvSndROM1 = Next; Next += 0x080000;
DrvPalette = (UINT32*)Next; Next += 0x2002 * sizeof(UINT32); DrvPalette = (UINT32*)Next; Next += 0x2002 * sizeof(UINT32);
@ -461,9 +461,9 @@ static INT32 DrvInit()
if (BurnLoadRom(DrvSndROM0 + 0x000000, 5, 1)) return 1; if (BurnLoadRom(DrvSndROM0 + 0x000000, 5, 1)) return 1;
if (BurnLoadRom(DrvSndROM0 + 0x020000, 6, 1)) return 1; if (BurnLoadRom(DrvSndROM0 + 0x020000, 6, 1)) return 1;
// if (BurnLoadRom(DrvSndROM1 + 0x000000, 7, 1)) return 1; if (BurnLoadRom(DrvSndROM1 + 0x000000, 7, 1)) return 1;
// if (BurnLoadRom(DrvSndROM1 + 0x020000, 8, 1)) return 1; if (BurnLoadRom(DrvSndROM1 + 0x020000, 8, 1)) return 1;
// memset (DrvSndROM1 + 0x40000, 0xff, 0x40000); memset (DrvSndROM1 + 0x40000, 0xff, 0x40000);
if (BurnLoadRom(DrvGfxROM0 + 0x000000, 9, 1)) return 1; if (BurnLoadRom(DrvGfxROM0 + 0x000000, 9, 1)) return 1;
if (BurnLoadRom(DrvGfxROM0 + 0x010000, 10, 1)) return 1; if (BurnLoadRom(DrvGfxROM0 + 0x010000, 10, 1)) return 1;
@ -550,11 +550,10 @@ static INT32 DrvInit()
ZetClose(); ZetClose();
// These use the same roms! // These use the same roms!
// BurnY8950Init(3579545, DrvSndROM0, 0x40000, NULL, &DrvSynchroniseStream, 0); // #0 BurnY8950Init(2, 3579545, DrvSndROM0, 0x40000, DrvSndROM1, 0x80000, NULL, &DrvSynchroniseStream, 0);
BurnY8950Init(3579545, DrvSndROM0, 0x40000, NULL, &DrvSynchroniseStream, 0); // #1
BurnTimerAttachZetY8950(3579545); BurnTimerAttachZetY8950(3579545);
// BurnY8950SetRoute(BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_BOTH); // #0 BurnY8950SetRoute(0, BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_RIGHT); // #0
BurnY8950SetRoute(BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_BOTH); // #1 BurnY8950SetRoute(1, BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_RIGHT); // #1
GenericTilesInit(); GenericTilesInit();

6
src/burn/drv/pre90s/d_ginganin.cpp
View File

@ -218,7 +218,7 @@ void ginganin_sound_write(UINT16 address, UINT8 data)
case 0x2000: case 0x2000:
case 0x2001: // y8950 case 0x2001: // y8950
BurnY8950Write(address & 1, data); BurnY8950Write(0, address & 1, data);
return; return;
case 0x2800: case 0x2800:
@ -403,9 +403,9 @@ static INT32 DrvInit()
AY8910Init(0, 3579545 / 2, nBurnSoundRate, NULL, NULL, NULL, NULL); AY8910Init(0, 3579545 / 2, nBurnSoundRate, NULL, NULL, NULL, NULL);
AY8910SetAllRoutes(0, 0.10, BURN_SND_ROUTE_BOTH); AY8910SetAllRoutes(0, 0.10, BURN_SND_ROUTE_BOTH);
BurnY8950Init(3579545, DrvSndROM, 0x20000, NULL, &DrvSynchroniseStream, 1); BurnY8950Init(1, 3579545, DrvSndROM, 0x20000, NULL, 0, NULL, &DrvSynchroniseStream, 1);
BurnTimerAttachM6809Y8950(1000000); BurnTimerAttachM6809Y8950(1000000);
BurnY8950SetRoute(BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_BOTH); BurnY8950SetRoute(0, BURN_SND_Y8950_ROUTE, 1.00, BURN_SND_ROUTE_BOTH);
GenericTilesInit(); GenericTilesInit();

121
src/burn/snd/burn_y8950.cpp
View File

@ -280,6 +280,8 @@ INT32 BurnTimerAttachM6502Y8950(INT32 nClockspeed)
// Sound Related // Sound Related
#define MAX_Y8950 2
void (*BurnY8950Update)(INT16* pSoundBuf, INT32 nSegmentEnd); void (*BurnY8950Update)(INT16* pSoundBuf, INT32 nSegmentEnd);
static INT32 (*BurnY8950StreamCallback)(INT32 nSoundRate); static INT32 (*BurnY8950StreamCallback)(INT32 nSoundRate);
@ -287,17 +289,19 @@ static INT32 (*BurnY8950StreamCallback)(INT32 nSoundRate);
static INT32 nBurnY8950SoundRate; static INT32 nBurnY8950SoundRate;
static INT16* pBuffer; static INT16* pBuffer;
static INT16* pY8950Buffer; static INT16* pY8950Buffer[MAX_Y8950];
static INT32 nY8950Position; static INT32 nY8950Position;
static UINT32 nSampleSize; static UINT32 nSampleSize;
static INT32 nFractionalPosition; static INT32 nFractionalPosition;
static INT32 nNumChips = 0;
static INT32 bY8950AddSignal; static INT32 bY8950AddSignal;
static double Y8950Volumes[1]; static double Y8950Volumes[1 * MAX_Y8950];
static INT32 Y8950RouteDirs[1]; static INT32 Y8950RouteDirs[1 * MAX_Y8950];
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Dummy functions // Dummy functions
@ -329,6 +333,10 @@ static void Y8950Render(INT32 nSegmentLength)
Y8950UpdateOne(0, pBuffer + 0 * 4096 + 4 + nY8950Position, nSegmentLength); Y8950UpdateOne(0, pBuffer + 0 * 4096 + 4 + nY8950Position, nSegmentLength);
if (nNumChips > 1) {
Y8950UpdateOne(1, pBuffer + 1 * 4096 + 4 + nY8950Position, nSegmentLength);
}
nY8950Position += nSegmentLength; nY8950Position += nSegmentLength;
} }
@ -356,7 +364,11 @@ static void Y8950UpdateResample(INT16* pSoundBuf, INT32 nSegmentEnd)
Y8950Render(nSamplesNeeded); Y8950Render(nSamplesNeeded);
pY8950Buffer = pBuffer + 0 * 4096 + 4; pY8950Buffer[0] = pBuffer + 0 * 4096 + 4;
if (nNumChips > 1) {
pY8950Buffer[1] = pBuffer + 1 * 4096 + 4;
}
for (INT32 i = (nFractionalPosition & 0xFFFF0000) >> 15; i < nSegmentLength; i += 2, nFractionalPosition += nSampleSize) { for (INT32 i = (nFractionalPosition & 0xFFFF0000) >> 15; i < nSegmentLength; i += 2, nFractionalPosition += nSampleSize) {
INT32 nLeftSample[4] = {0, 0, 0, 0}; INT32 nLeftSample[4] = {0, 0, 0, 0};
@ -364,16 +376,31 @@ static void Y8950UpdateResample(INT16* pSoundBuf, INT32 nSegmentEnd)
INT32 nTotalLeftSample, nTotalRightSample; INT32 nTotalLeftSample, nTotalRightSample;
if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) { if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) {
nLeftSample[0] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 3] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nLeftSample[0] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 3] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nLeftSample[1] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 2] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nLeftSample[1] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 2] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nLeftSample[2] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 1] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nLeftSample[2] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 1] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nLeftSample[3] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 0] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nLeftSample[3] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 0] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
} }
if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) { if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) {
nRightSample[0] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 3] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nRightSample[0] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 3] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nRightSample[1] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 2] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nRightSample[1] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 2] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nRightSample[2] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 1] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nRightSample[2] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 1] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
nRightSample[3] += (INT32)(pY8950Buffer[(nFractionalPosition >> 16) - 0] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nRightSample[3] += (INT32)(pY8950Buffer[0][(nFractionalPosition >> 16) - 0] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
}
if (nNumChips > 1) {
if ((Y8950RouteDirs[1 + BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) {
nLeftSample[0] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 3] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nLeftSample[1] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 2] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nLeftSample[2] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 1] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nLeftSample[3] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 0] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
}
if ((Y8950RouteDirs[1 + BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) {
nRightSample[0] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 3] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nRightSample[1] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 2] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nRightSample[2] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 1] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
nRightSample[3] += (INT32)(pY8950Buffer[1][(nFractionalPosition >> 16) - 0] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
}
} }
nTotalLeftSample = INTERPOLATE4PS_16BIT((nFractionalPosition >> 4) & 0x0fff, nLeftSample[0], nLeftSample[1], nLeftSample[2], nLeftSample[3]); nTotalLeftSample = INTERPOLATE4PS_16BIT((nFractionalPosition >> 4) & 0x0fff, nLeftSample[0], nLeftSample[1], nLeftSample[2], nLeftSample[3]);
@ -395,7 +422,11 @@ static void Y8950UpdateResample(INT16* pSoundBuf, INT32 nSegmentEnd)
INT32 nExtraSamples = nSamplesNeeded - (nFractionalPosition >> 16); INT32 nExtraSamples = nSamplesNeeded - (nFractionalPosition >> 16);
for (INT32 i = -4; i < nExtraSamples; i++) { for (INT32 i = -4; i < nExtraSamples; i++) {
pY8950Buffer[i] = pY8950Buffer[(nFractionalPosition >> 16) + i]; pY8950Buffer[0][i] = pY8950Buffer[0][(nFractionalPosition >> 16) + i];
if (nNumChips > 1) {
pY8950Buffer[1][i] = pY8950Buffer[1][(nFractionalPosition >> 16) + i];
}
} }
nFractionalPosition &= 0xFFFF; nFractionalPosition &= 0xFFFF;
@ -422,16 +453,29 @@ static void Y8950UpdateNormal(INT16* pSoundBuf, INT32 nSegmentEnd)
Y8950Render(nSegmentEnd); Y8950Render(nSegmentEnd);
pY8950Buffer = pBuffer + 4 + 0 * 4096; pY8950Buffer[0] = pBuffer + 4 + 0 * 4096;
if (nNumChips > 1) {
pY8950Buffer[1] = pBuffer + 4 + 1 * 4096;
}
for (INT32 n = nFractionalPosition; n < nSegmentLength; n++) { for (INT32 n = nFractionalPosition; n < nSegmentLength; n++) {
INT32 nLeftSample = 0, nRightSample = 0; INT32 nLeftSample = 0, nRightSample = 0;
if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) { if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) {
nLeftSample += (INT32)(pY8950Buffer[n] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nLeftSample += (INT32)(pY8950Buffer[0][n] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
} }
if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) { if ((Y8950RouteDirs[BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) {
nRightSample += (INT32)(pY8950Buffer[n] * Y8950Volumes[BURN_SND_Y8950_ROUTE]); nRightSample += (INT32)(pY8950Buffer[0][n] * Y8950Volumes[BURN_SND_Y8950_ROUTE]);
}
if (nNumChips > 1) {
if ((Y8950RouteDirs[1 + BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_LEFT) == BURN_SND_ROUTE_LEFT) {
nLeftSample += (INT32)(pY8950Buffer[1][n] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
}
if ((Y8950RouteDirs[1 + BURN_SND_Y8950_ROUTE] & BURN_SND_ROUTE_RIGHT) == BURN_SND_ROUTE_RIGHT) {
nRightSample += (INT32)(pY8950Buffer[1][n] * Y8950Volumes[1 + BURN_SND_Y8950_ROUTE]);
}
} }
nLeftSample = BURN_SND_CLIP(nLeftSample); nLeftSample = BURN_SND_CLIP(nLeftSample);
@ -485,7 +529,9 @@ void BurnY8950Reset()
BurnTimerResetY8950(); BurnTimerResetY8950();
Y8950ResetChip(0); for (INT32 i = 0; i < nNumChips; i++) {
Y8950ResetChip(i);
}
} }
void BurnY8950Exit() void BurnY8950Exit()
@ -498,17 +544,15 @@ void BurnY8950Exit()
BurnTimerExitY8950(); BurnTimerExitY8950();
if (pBuffer) { BurnFree(pBuffer);
free(pBuffer);
pBuffer = NULL;
}
nNumChips = 0;
bY8950AddSignal = 0; bY8950AddSignal = 0;
DebugSnd_Y8950Initted = 0; DebugSnd_Y8950Initted = 0;
} }
INT32 BurnY8950Init(INT32 nClockFrequency, UINT8* Y8950ADPCMROM, INT32 nY8950ADPCMSize, OPL_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), INT32 bAddSignal) INT32 BurnY8950Init(INT32 num, INT32 nClockFrequency, UINT8* Y8950ADPCM0ROM, INT32 nY8950ADPCM0Size, UINT8* Y8950ADPCM1ROM, INT32 nY8950ADPCM1Size, OPL_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), INT32 bAddSignal)
{ {
BurnTimerInitY8950(&Y8950TimerOver, NULL); BurnTimerInitY8950(&Y8950TimerOver, NULL);
@ -517,7 +561,7 @@ INT32 BurnY8950Init(INT32 nClockFrequency, UINT8* Y8950ADPCMROM, INT32 nY8950ADP
BurnY8950Update = Y8950UpdateDummy; BurnY8950Update = Y8950UpdateDummy;
Y8950Init(1, nClockFrequency, 11025); Y8950Init(num, nClockFrequency, 11025);
return 0; return 0;
} }
@ -541,41 +585,60 @@ INT32 BurnY8950Init(INT32 nClockFrequency, UINT8* Y8950ADPCMROM, INT32 nY8950ADP
BurnY8950Update = Y8950UpdateNormal; BurnY8950Update = Y8950UpdateNormal;
} }
Y8950Init(1, nClockFrequency, nBurnY8950SoundRate); Y8950Init(num, nClockFrequency, nBurnY8950SoundRate);
Y8950SetIRQHandler(0, IRQCallback, 0); Y8950SetIRQHandler(0, IRQCallback, 0);
Y8950SetTimerHandler(0, &BurnOPLTimerCallbackY8950, 0); Y8950SetTimerHandler(0, &BurnOPLTimerCallbackY8950, 0);
Y8950SetUpdateHandler(0, &BurnY8950UpdateRequest, 0); Y8950SetUpdateHandler(0, &BurnY8950UpdateRequest, 0);
Y8950SetDeltaTMemory(0, Y8950ADPCMROM, nY8950ADPCMSize); Y8950SetDeltaTMemory(0, Y8950ADPCM0ROM, nY8950ADPCM0Size);
if (num > 1) {
// Y8950SetIRQHandler(1, IRQCallback, 0); // ??
Y8950SetTimerHandler(1, &BurnOPLTimerCallbackY8950, 0);
Y8950SetUpdateHandler(1, &BurnY8950UpdateRequest, 0);
Y8950SetDeltaTMemory(1, Y8950ADPCM1ROM, nY8950ADPCM1Size);
}
pBuffer = (INT16*)malloc(4096 * sizeof(INT16)); pBuffer = (INT16*)BurnMalloc(4096 * num * sizeof(INT16));
memset(pBuffer, 0, 4096 * sizeof(INT16)); memset(pBuffer, 0, 4096 * num * sizeof(INT16));
nY8950Position = 0; nY8950Position = 0;
nFractionalPosition = 0; nFractionalPosition = 0;
nNumChips = num;
bY8950AddSignal = bAddSignal; bY8950AddSignal = bAddSignal;
// default routes // default routes
Y8950Volumes[BURN_SND_Y8950_ROUTE] = 1.00; Y8950Volumes[BURN_SND_Y8950_ROUTE] = 1.00;
Y8950RouteDirs[BURN_SND_Y8950_ROUTE] = BURN_SND_ROUTE_BOTH; Y8950RouteDirs[BURN_SND_Y8950_ROUTE] = BURN_SND_ROUTE_BOTH;
if (nNumChips > 1) {
Y8950Volumes[1 + BURN_SND_Y8950_ROUTE] = 1.00;
Y8950RouteDirs[1 + BURN_SND_Y8950_ROUTE] = BURN_SND_ROUTE_BOTH;
}
DebugSnd_Y8950Initted = 1; DebugSnd_Y8950Initted = 1;
return 0; return 0;
} }
void BurnY8950SetRoute(INT32 nIndex, double nVolume, INT32 nRouteDir) void BurnY8950SetRoute(INT32 nChip, INT32 nIndex, double nVolume, INT32 nRouteDir)
{ {
#if defined FBA_DEBUG #if defined FBA_DEBUG
if (!DebugSnd_Y8950Initted) bprintf(PRINT_ERROR, _T("BurnY8950SetRoute called without init\n")); if (!DebugSnd_Y8950Initted) bprintf(PRINT_ERROR, _T("BurnY8950SetRoute called without init\n"));
if (nIndex < 0 || nIndex > 1) bprintf(PRINT_ERROR, _T("BurnY8950SetRoute called with invalid index %i\n"), nIndex); if (nIndex < 0 || nIndex > 1) bprintf(PRINT_ERROR, _T("BurnY8950SetRoute called with invalid index %i\n"), nIndex);
if (nChip >= nNumChips) bprintf(PRINT_ERROR, _T("BurnY8950SetRoute called with invalid chip %i\n"), nChip);
#endif #endif
if (nChip == 0) {
Y8950Volumes[nIndex] = nVolume; Y8950Volumes[nIndex] = nVolume;
Y8950RouteDirs[nIndex] = nRouteDir; Y8950RouteDirs[nIndex] = nRouteDir;
} }
if (nChip == 1) {
Y8950Volumes[1 + nIndex] = nVolume;
Y8950RouteDirs[1 + nIndex] = nRouteDir;
}
}
void BurnY8950Scan(INT32 nAction, INT32* pnMin) void BurnY8950Scan(INT32 nAction, INT32* pnMin)
{ {
#if defined FBA_DEBUG #if defined FBA_DEBUG
@ -589,3 +652,5 @@ void BurnY8950Scan(INT32 nAction, INT32* pnMin)
SCAN_VAR(nY8950Position); SCAN_VAR(nY8950Position);
} }
} }
#undef MAX_Y8950

10
src/burn/snd/burn_y8950.h
View File

@ -18,8 +18,8 @@ INT32 BurnTimerAttachM6502Y8950(INT32 nClockspeed);
extern "C" void BurnY8950UpdateRequest(); extern "C" void BurnY8950UpdateRequest();
INT32 BurnY8950Init(INT32 nClockFrequency, UINT8* Y8950ADPCMROM, INT32 nY8950ADPCMSize, OPL_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), INT32 bAddSignal); INT32 BurnY8950Init(INT32 num, INT32 nClockFrequency, UINT8* Y8950ADPCM0ROM, INT32 nY8950ADPCM0Size, UINT8* Y8950ADPCM1ROM, INT32 nY8950ADPCM1Size, OPL_IRQHANDLER IRQCallback, INT32 (*StreamCallback)(INT32), INT32 bAddSignal);
void BurnY8950SetRoute(INT32 nIndex, double nVolume, INT32 nRouteDir); void BurnY8950SetRoute(INT32 nChip, INT32 nIndex, double nVolume, INT32 nRouteDir);
void BurnY8950Reset(); void BurnY8950Reset();
void BurnY8950Exit(); void BurnY8950Exit();
extern void (*BurnY8950Update)(INT16* pSoundBuf, INT32 nSegmentEnd); extern void (*BurnY8950Update)(INT16* pSoundBuf, INT32 nSegmentEnd);
@ -27,10 +27,10 @@ void BurnY8950Scan(INT32 nAction, INT32* pnMin);
#define BURN_SND_Y8950_ROUTE 0 #define BURN_SND_Y8950_ROUTE 0
#define BurnY8950Read(a) Y8950Read(0, a) #define BurnY8950Read(i, a) Y8950Read(i, a)
#if defined FBA_DEBUG #if defined FBA_DEBUG
#define BurnY8950Write(a, n) if (!DebugSnd_Y8950Initted) bprintf(PRINT_ERROR, _T("BurnY8950Write called without init\n")); Y8950Write(0, a, n) #define BurnY8950Write(i, a, n) if (!DebugSnd_Y8950Initted) bprintf(PRINT_ERROR, _T("BurnY8950Write called without init\n")); Y8950Write(i, a, n)
#else #else
#define BurnY8950Write(a, n) Y8950Write(0, a, n) #define BurnY8950Write(i, a, n) Y8950Write(i, a, n)
#endif #endif