From e7d9c2bc93e14277f0542a162dae1ba77a8951ad Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Wed, 16 May 2012 15:26:45 +0000 Subject: [PATCH] Update Misc Post 90s and Sega drivers with YM2203 route support --- src/burn/drv/pst90s/d_airbustr.cpp | 5 ++++- src/burn/drv/pst90s/d_gaiden.cpp | 8 ++++++++ src/burn/drv/pst90s/d_nmk16.cpp | 9 +++++++++ src/burn/drv/pst90s/d_pass.cpp | 3 ++- src/burn/drv/pst90s/d_powerins.cpp | 2 +- src/burn/drv/pst90s/d_pushman.cpp | 3 ++- src/burn/drv/sega/d_angelkds.cpp | 8 ++++++++ src/burn/drv/sega/sys16_run.cpp | 5 ++++- 8 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/burn/drv/pst90s/d_airbustr.cpp b/src/burn/drv/pst90s/d_airbustr.cpp index b571167b4..f1032ff92 100644 --- a/src/burn/drv/pst90s/d_airbustr.cpp +++ b/src/burn/drv/pst90s/d_airbustr.cpp @@ -629,8 +629,11 @@ static INT32 DrvInit() BurnYM2203Init(1, 3000000, NULL, DrvSynchroniseStream, DrvGetTime, 0); BurnYM2203SetPorts(0, &DrvYM2203PortA, &DrvYM2203PortB, NULL, NULL); - BurnYM2203SetVolumeShift(2); BurnTimerAttachZet(6000000); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 0.50, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.25, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.25, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.25, BURN_SND_ROUTE_BOTH); MSM6295Init(0, 3000000 / 132, 80, 1); diff --git a/src/burn/drv/pst90s/d_gaiden.cpp b/src/burn/drv/pst90s/d_gaiden.cpp index af22ddd02..dbeaed544 100644 --- a/src/burn/drv/pst90s/d_gaiden.cpp +++ b/src/burn/drv/pst90s/d_gaiden.cpp @@ -1056,6 +1056,14 @@ static INT32 DrvInit() } else { BurnYM2203Init(2, 4000000, &DrvYM2203IRQHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnTimerAttachZet(4000000); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 0.60, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.15, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.15, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.15, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_YM2203_ROUTE, 0.60, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_1, 0.15, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_2, 0.15, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_3, 0.15, BURN_SND_ROUTE_BOTH); } MSM6295Init(0, 1000000 / 132, 80, 1); diff --git a/src/burn/drv/pst90s/d_nmk16.cpp b/src/burn/drv/pst90s/d_nmk16.cpp index 37493a309..03f728b56 100644 --- a/src/burn/drv/pst90s/d_nmk16.cpp +++ b/src/burn/drv/pst90s/d_nmk16.cpp @@ -4132,6 +4132,10 @@ static INT32 DrvInit(INT32 (*pLoadCallback)()) BurnYM2203Init(1, 1500000, &DrvYM2203IrqHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnTimerAttachZet(3000000); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 2.00, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.50, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.50, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.50, BURN_SND_ROUTE_BOTH); MSM6295Init(0, 4000000 / 165, 20.0, 1); MSM6295Init(1, 4000000 / 165, 20.0, 1); @@ -4253,6 +4257,7 @@ static INT32 Macross2Init() BurnYM2203Init(1, 1500000, &DrvYM2203IrqHandler, Macross2SynchroniseStream, Macross2GetTime, 0); BurnTimerAttachZet(4000000); + BurnYM2203SetAllRoutes(0, 0.90, BURN_SND_ROUTE_BOTH); MSM6295Init(0, 4000000 / 165, 20.0, 1); MSM6295Init(1, 4000000 / 165, 20.0, 1); @@ -4423,6 +4428,10 @@ static INT32 NMK004Init(INT32 (*pLoadCallback)(), INT32 nCpuSpeed, INT32 pin7hig BurnYM2203Init(1, 1500000, &NMK004YM2203IrqHandler, NMK004SynchroniseStream, NMK004GetTime, 0); BurnTimerAttachSek(nNMK004CpuSpeed); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 2.00, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.50, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.50, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.50, BURN_SND_ROUTE_BOTH); MSM6295Init(0, 4000000 / (pin7high ? 132 : 165), 20.0, 1); MSM6295Init(1, 4000000 / (pin7high ? 132 : 165), 20.0, 1); diff --git a/src/burn/drv/pst90s/d_pass.cpp b/src/burn/drv/pst90s/d_pass.cpp index ead5d8149..55e0058b4 100644 --- a/src/burn/drv/pst90s/d_pass.cpp +++ b/src/burn/drv/pst90s/d_pass.cpp @@ -276,8 +276,9 @@ static INT32 DrvInit() BurnYM2203Init(1, 3579545, NULL, DrvSynchroniseStream, DrvGetTime, 0); BurnTimerAttachZet(3579545); + BurnYM2203SetAllRoutes(0, 0.60, BURN_SND_ROUTE_BOTH); - MSM6295Init(0, 792000 / 132, 100.0, 1); + MSM6295Init(0, 792000 / 132, 60.0, 1); GenericTilesInit(); diff --git a/src/burn/drv/pst90s/d_powerins.cpp b/src/burn/drv/pst90s/d_powerins.cpp index 69ac1301d..fe7d9b6b1 100644 --- a/src/burn/drv/pst90s/d_powerins.cpp +++ b/src/burn/drv/pst90s/d_powerins.cpp @@ -855,8 +855,8 @@ static INT32 powerinsInit() if (game_drv == GAME_POWERINS ) { BurnYM2203Init(1, 12000000 / 8, &powerinsIRQHandler, powerinsSynchroniseStream, powerinsGetTime, 0); - BurnYM2203SetVolumeShift(2); BurnTimerAttachZet(6000000); + BurnYM2203SetAllRoutes(0, 2.00, BURN_SND_ROUTE_BOTH); BurnSetRefreshRate(56.0); MSM6295Init(0, 4000000 / 165, 40, 1); diff --git a/src/burn/drv/pst90s/d_pushman.cpp b/src/burn/drv/pst90s/d_pushman.cpp index 06bfa9feb..94c19b956 100644 --- a/src/burn/drv/pst90s/d_pushman.cpp +++ b/src/burn/drv/pst90s/d_pushman.cpp @@ -562,8 +562,9 @@ static INT32 DrvInit() // m6805Close(); BurnYM2203Init(2, 2000000, &DrvIRQHandler, DrvSynchroniseStream, DrvGetTime, 0); - BurnYM2203SetVolumeShift(1); BurnTimerAttachZet(4000000); + BurnYM2203SetAllRoutes(0, 0.40, BURN_SND_ROUTE_BOTH); + BurnYM2203SetAllRoutes(1, 0.40, BURN_SND_ROUTE_BOTH); GenericTilesInit(); diff --git a/src/burn/drv/sega/d_angelkds.cpp b/src/burn/drv/sega/d_angelkds.cpp index d5b38b3ca..9dc93ac69 100644 --- a/src/burn/drv/sega/d_angelkds.cpp +++ b/src/burn/drv/sega/d_angelkds.cpp @@ -704,6 +704,14 @@ static INT32 DrvInit(INT32 game) BurnYM2203Init(2, 4000000, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0); BurnTimerAttachZet(4000000); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 0.45, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.65, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.65, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.65, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_YM2203_ROUTE, 0.45, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_1, 0.65, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_2, 0.65, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_3, 0.65, BURN_SND_ROUTE_BOTH); GenericTilesInit(); diff --git a/src/burn/drv/sega/sys16_run.cpp b/src/burn/drv/sega/sys16_run.cpp index 50859dc0d..4b5fb5b49 100644 --- a/src/burn/drv/sega/sys16_run.cpp +++ b/src/burn/drv/sega/sys16_run.cpp @@ -2074,8 +2074,11 @@ INT32 System16Init() if (BurnDrvGetHardwareCode() & HARDWARE_SEGA_YM2203) { BurnYM2203Init(1, 4000000, &System16YM2203IRQHandler, System16SynchroniseStream, System16GetTime, 0); - BurnYM2203SetVolumeShift(2); BurnTimerAttachZet(4000000); + BurnYM2203SetRoute(0, BURN_SND_YM2203_YM2203_ROUTE, 0.37, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, 0.13, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, 0.13, BURN_SND_ROUTE_BOTH); + BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, 0.13, BURN_SND_ROUTE_BOTH); } else { BurnYM2151Init(4000000, 25.0); BurnYM2151SetIrqHandler(&System16YM2151IRQHandler);