X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_snd.c;h=e85fdf9b98683cd1fc27d7b05e08be3f0151874d;hb=734addea4c40d2e7fb6470bdf51ce96343a25e59;hp=47cab348332462fb8a4a85e326c22b1888540818;hpb=f1605e99959acfb32b36ae875601fc14dd670742;p=16.git

diff --git a/src/lib/16_snd.c b/src/lib/16_snd.c
index 47cab348..e85fdf9b 100755
--- a/src/lib/16_snd.c
+++ b/src/lib/16_snd.c
@@ -1,31 +1,30 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2015 sparky4 & pngwen & andrius4669
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "src/lib/16_snd.h"
-
-void opl2out(word reg, word data)
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "src/lib/16_snd.h"
+
+void opl2out(word reg, word data)
 {
-	__asm
+	__asm
 	{
 		mov     ax,reg
 		mov     dx,word ptr [ADLIB_FM_ADDRESS]
@@ -43,12 +42,12 @@ void opl2out(word reg, word data)
 		mov     cx,36
 @@3:    in      al,dx
 		loop    @@3
-	}
+	}
 }
 
-void opl3out(word reg, word data)
+void opl3out(word reg, word data)
 {
-	__asm
+	__asm
 	{
 		mov     ax,reg
 		mov     dx,word ptr [ADLIB_FM_ADDRESS]
@@ -63,12 +62,12 @@ void opl3out(word reg, word data)
 		mov     cx,26
 @@2:    in      al,dx
 		loop    @@2
-	}
+	}
 }
 
-void opl3exp(word data)
+void opl3exp(word data)
 {
-	__asm
+	__asm
 	{
 		mov     ax,data
 		mov     dx,word ptr [ADLIB_FM_ADDRESS]
@@ -82,17 +81,17 @@ void opl3exp(word data)
 		out     dx,al
 		mov     cx,36
 @@2:    in      al,dx
-		loop    @@2
+		loop    @@2
 	}
-}
-
+}
+
 /* Function: FMResest *******************************************************
 *
 *     Description:        quick and dirty sound card reset (zeros all
 *                         registers).
 *
 */
-void FMReset(void/*int percusiveMode*/)
+void FMReset(void/*int percusiveMode*/)
 {
 	int i;
 
@@ -106,8 +105,8 @@ void FMReset(void/*int percusiveMode*/)
 	opl2out(0xBD, 0x20);
 
 	//FMSetPercusiveMode(percusiveMode);
-} /* End of FMReset */
-
+} /* End of FMReset */
+
 /* Function: FMKeyOff *******************************************************
 *
 *     Parameters:        voice - which voice to turn off.
@@ -115,7 +114,7 @@ void FMReset(void/*int percusiveMode*/)
 *     Description:        turns off the specified voice.
 *
 */
-void FMKeyOff(int voice)
+void FMKeyOff(int voice)
 {
 	int regNum;
 
@@ -134,17 +133,17 @@ void FMKeyOff(int voice)
 *                         octave.
 *
 */
-void FMKeyOn(int voice, int freq, int octave)
+void FMKeyOn(int voice, int freq, int octave)
 {
 	int regNum, tmp;
 
 	regNum = 0xA0 + voice % 11;//NUMVOICE;
 	opl2out(regNum, freq & 0xff);
 	regNum = 0xB0 + voice % 11;//NUMVOICE;
-	tmp = (freq >> 8) | (octave << 2) | 0x20;
+	tmp = (freq >> 8) | (octave << 2) | 0x20;
 	opl2out(regNum, tmp);
-} /* End of FMKeyOn */
-
+} /* End of FMKeyOn */
+
 /* Function: FMSetVoice *****************************************************
 *
 *     Parameters:        voiceNum - which voice to set.
@@ -192,4 +191,4 @@ void FMSetVoice(int voiceNum, FMInstrument *ins){
 	/* set Feedback/Selectivity */
 	opCellNum = (byte)0xC0 + (byte)voiceNum;
 	opl2out(opCellNum, ins->Feedback);
-} /* End of FMSetVoice */
+} /* End of FMSetVoice */