From 3711d6e12b51007c1c221480f2de5721fb7020dc Mon Sep 17 00:00:00 2001
From: Barry Harris <44396066+barry65536@users.noreply.github.com>
Date: Tue, 15 May 2012 19:42:03 +0000
Subject: [PATCH] Add YM2610 route support to remaining drivers (Taito drivers
 still need filter support adding ideally)

---
 src/burn/drv/psikyo/d_psikyo.cpp   |  3 +++
 src/burn/drv/pst90s/d_aerofgt.cpp  | 15 +++++++++++++++
 src/burn/drv/pst90s/d_crshrace.cpp |  3 +++
 src/burn/drv/pst90s/d_f1gp.cpp     |  3 +++
 src/burn/drv/pst90s/d_mcatadv.cpp  |  3 +++
 src/burn/drv/pst90s/d_taotaido.cpp |  3 +++
 src/burn/drv/taito/d_slapshot.cpp  |  3 +++
 src/burn/drv/taito/d_taitof2.cpp   |  3 +++
 src/burn/drv/taito/d_taitox.cpp    |  3 +++
 9 files changed, 39 insertions(+)

diff --git a/src/burn/drv/psikyo/d_psikyo.cpp b/src/burn/drv/psikyo/d_psikyo.cpp
index faf3caee2..4669f9a9c 100644
--- a/src/burn/drv/psikyo/d_psikyo.cpp
+++ b/src/burn/drv/psikyo/d_psikyo.cpp
@@ -1858,6 +1858,9 @@ static INT32 DrvInit()
 		case PSIKYO_HW_GUNBIRD: {
 			BurnYM2610Init(8000000, PsikyoSampleROM02, &PsikyoSampleROM02Size, PsikyoSampleROM01, &PsikyoSampleROM01Size, &PsikyoFMIRQHandler, PsikyoSynchroniseStream, PsikyoGetTime, 0);
 			BurnTimerAttachZet(4000000);
+			BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+			BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+			BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 1.20, BURN_SND_ROUTE_BOTH);
 			break;
 		}
 		case PSIKYO_HW_S1945:
diff --git a/src/burn/drv/pst90s/d_aerofgt.cpp b/src/burn/drv/pst90s/d_aerofgt.cpp
index 1b048d96a..3fc475bba 100644
--- a/src/burn/drv/pst90s/d_aerofgt.cpp
+++ b/src/burn/drv/pst90s/d_aerofgt.cpp
@@ -640,6 +640,9 @@ static INT32 aerofgtInit()
 	
 	BurnYM2610Init(8000000, RomSnd2, &RomSndSize2, RomSnd1, &RomSndSize1, &aerofgtFMIRQHandler, aerofgtSynchroniseStream, aerofgtGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	DrvDoReset();												// Reset machine
 	return 0;
@@ -1672,6 +1675,9 @@ static INT32 turbofrcInit()
 	
 	BurnYM2610Init(8000000, RomSnd2, &RomSndSize2, RomSnd1, &RomSndSize1, &aerofgtFMIRQHandler, aerofgtSynchroniseStream, aerofgtGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	DrvDoReset();	
 	
@@ -2633,6 +2639,9 @@ static INT32 karatblzInit()
 	
 	BurnYM2610Init(8000000, RomSnd2, &RomSndSize2, RomSnd1, &RomSndSize1, &aerofgtFMIRQHandler, aerofgtSynchroniseStream, aerofgtGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	DrvDoReset();	
 	
@@ -3362,6 +3371,9 @@ static INT32 spinlbrkInit()
 	
 	BurnYM2610Init(8000000, RomSnd2, &RomSndSize2, RomSnd1, &RomSndSize1, &aerofgtFMIRQHandler, aerofgtSynchroniseStream, aerofgtGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	bg2scrollx = 0;	// 
 	
@@ -3872,6 +3884,9 @@ static INT32 aerofgtbInit()
 	
 	BurnYM2610Init(8000000, RomSnd2, &RomSndSize2, RomSnd1, &RomSndSize1, &aerofgtFMIRQHandler, aerofgtSynchroniseStream, aerofgtGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	DrvDoReset();												// Reset machine
 	return 0;
diff --git a/src/burn/drv/pst90s/d_crshrace.cpp b/src/burn/drv/pst90s/d_crshrace.cpp
index 69822ef2d..cf1171d46 100644
--- a/src/burn/drv/pst90s/d_crshrace.cpp
+++ b/src/burn/drv/pst90s/d_crshrace.cpp
@@ -532,6 +532,9 @@ static INT32 DrvInit()
 	INT32 DrvSndROMLen = 0x100000;
 	BurnYM2610Init(8000000, DrvSndROM + 0x100000, &DrvSndROMLen, DrvSndROM, &DrvSndROMLen, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 
 	GenericTilesInit();
 
diff --git a/src/burn/drv/pst90s/d_f1gp.cpp b/src/burn/drv/pst90s/d_f1gp.cpp
index dc03e3ee4..6d1026f68 100644
--- a/src/burn/drv/pst90s/d_f1gp.cpp
+++ b/src/burn/drv/pst90s/d_f1gp.cpp
@@ -738,6 +738,9 @@ static INT32 DrvInit(INT32 nGame)
 	INT32 DrvSndROMLen = 0x100000;
 	BurnYM2610Init(8000000, DrvSndROM + 0x100000, &DrvSndROMLen, DrvSndROM, &DrvSndROMLen, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
 	BurnTimerAttachZet(5000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 
 	DrvInitZoomTable();
 	GenericTilesInit();
diff --git a/src/burn/drv/pst90s/d_mcatadv.cpp b/src/burn/drv/pst90s/d_mcatadv.cpp
index 5c4d9e632..f978bf258 100644
--- a/src/burn/drv/pst90s/d_mcatadv.cpp
+++ b/src/burn/drv/pst90s/d_mcatadv.cpp
@@ -606,6 +606,9 @@ static INT32 DrvInit()
 	INT32 DrvSndROMLen = nGame ? 0x100000 : 0x80000;
 	BurnYM2610Init(8000000, DrvSndROM, &DrvSndROMLen, DrvSndROM, &DrvSndROMLen, &DrvFMIRQHandler, DrvSynchroniseStream, DrvGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 2.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 2.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 1.28, BURN_SND_ROUTE_BOTH);
 
 	GenericTilesInit();
 
diff --git a/src/burn/drv/pst90s/d_taotaido.cpp b/src/burn/drv/pst90s/d_taotaido.cpp
index 7a67c08a1..d6723aee0 100644
--- a/src/burn/drv/pst90s/d_taotaido.cpp
+++ b/src/burn/drv/pst90s/d_taotaido.cpp
@@ -729,6 +729,9 @@ static INT32 DrvInit()
 	INT32 nDrvSndROM1Size = 0x200000;
 	BurnYM2610Init(8000000, DrvSndROM1, &nDrvSndROM1Size, DrvSndROM0, &nDrvSndROM0Size, &taotaidoFMIRQHandler, taotaidoSynchroniseStream, taotaidoGetTime, 0);
 	BurnTimerAttachZet(5000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 
 	GenericTilesInit();
 
diff --git a/src/burn/drv/taito/d_slapshot.cpp b/src/burn/drv/taito/d_slapshot.cpp
index 7f771cdbc..920e23570 100644
--- a/src/burn/drv/taito/d_slapshot.cpp
+++ b/src/burn/drv/taito/d_slapshot.cpp
@@ -549,6 +549,9 @@ static INT32 MachineInit()
 	
 	BurnYM2610Init(8000000, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &SlapshotFMIRQHandler, SlapshotSynchroniseStream, SlapshotGetTime, 0);
 	BurnTimerAttachZet(4000000);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	
 	TaitoMakeInputsFunction = TC0640FIOMakeInputs;
 	TaitoDrawFunction = SlapshotDraw;
diff --git a/src/burn/drv/taito/d_taitof2.cpp b/src/burn/drv/taito/d_taitof2.cpp
index ac93de592..ed9048246 100644
--- a/src/burn/drv/taito/d_taitof2.cpp
+++ b/src/burn/drv/taito/d_taitof2.cpp
@@ -7427,6 +7427,9 @@ static void TaitoF2SoundInit()
 	
 	BurnYM2610Init(24000000 / 3, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, &TaitoF2FMIRQHandler, TaitoF2SynchroniseStream, TaitoF2GetTime, 0);
 	BurnTimerAttachZet(24000000 / 6);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+	BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 }
 
 static void SwitchToMusashi()
diff --git a/src/burn/drv/taito/d_taitox.cpp b/src/burn/drv/taito/d_taitox.cpp
index a18400b48..20d275ff6 100644
--- a/src/burn/drv/taito/d_taitox.cpp
+++ b/src/burn/drv/taito/d_taitox.cpp
@@ -1126,6 +1126,9 @@ static INT32 TaitoXInit(INT32 nSoundType)
 			BurnYM2610Init(8000000, TaitoYM2610BRom, (INT32*)&TaitoYM2610BRomSize, TaitoYM2610ARom, (INT32*)&TaitoYM2610ARomSize, &TaitoXFMIRQHandler, TaitoXSynchroniseStream, TaitoXGetTime, 0);
 		}
 		BurnTimerAttachZet(4000000);
+		BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_1, 1.00, BURN_SND_ROUTE_LEFT);
+		BurnYM2610SetRoute(BURN_SND_YM2610_YM2610_ROUTE_2, 1.00, BURN_SND_ROUTE_RIGHT);
+		BurnYM2610SetRoute(BURN_SND_YM2610_AY8910_ROUTE, 0.25, BURN_SND_ROUTE_BOTH);
 	}
 	
 	GenericTilesInit();