arm7: split SND into SND_global and SND_channel

11 files changed, 114 insertions, 103 deletions

diff --git a/arm7/arm7.lsf b/arm7/arm7.lsf
index c8c7e318..950f30e7 100644
--- a/arm7/arm7.lsf
+++ b/arm7/arm7.lsf
@@ -40,7 +40,8 @@ Autoload WRAM
 	Object PXI_fifo.o
 	Object EXI_genPort.o
 	Object PAD_xyButton.o
-	Object SND.o
+	Object SND_global.o
+	Object SND_channel.o
 	Object SND_util.o
 	Object SND_main.o
 	Object SND_capture.o
diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h
new file mode 100644
index 00000000..0c3cbe7b
--- /dev/null
+++ b/arm7/lib/include/SND_channel.h
@@ -0,0 +1,47 @@
+#ifndef GUARD_SND_CHANNEL_H
+#define GUARD_SND_CHANNEL_H
+
+#include "nitro/types.h"
+
+void SND_SetupChannelPcm(
+    int chnIdx,
+    const void *data,
+    int format,
+    int loop,
+    int loopStart,
+    int loopLen,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_SetupChannelPsg(
+    int chnIdx,
+    int waveDuty,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_SetupChannelNoise(
+    int chnIdx,
+    int volume,
+    int volumeDiv,
+    int timer,
+    int pan
+);
+
+void SND_StopChannel(int chnIdx, int hold);
+
+void SND_SetChannelVolume(int chnIdx, int volume, int volumeDiv);
+void SND_SetChannelTimer(int chnIdx, int timer);
+void SND_SetChannelPan(int chnIdx, int pan);
+
+BOOL SND_IsChannelActive(int idx);
+void SND_SetMasterPan(int pan);
+u32 SND_GetChannelControl(int idx);
+void SNDi_SetSurroundDecay(int decay);
+
+#endif //GUARD_SND_CHANNEL_H
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index a2d19971..99f8de21 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -21,7 +21,6 @@ void SND_ReleaseExChannel(struct SNDExChannel *chn);
 BOOL SND_IsExChannelActive(struct SNDExChannel *chn);
 struct SNDExChannel *SND_AllocExChannel(u32 channelMask, int priority, u32 flags, SNDExChannelCallback callback, void *callbackUserData);
 void SND_FreeExChannel(struct SNDExChannel *chn);
-BOOL SND_IsChannelActive(int idx);
 void SND_InvalidateWave(const void *start, const void *end);
 
 // TODO internal functions, move these so exChannel
@@ -42,47 +41,5 @@ void SND_InitLfoParam(struct SNDLfoParam *lfoParam);
 void SND_StartLfo(struct SNDLfo *lfo);
 void SND_UpdateLfo(struct SNDLfo *lfo);
 int SND_GetLfoValue(struct SNDLfo *lfo);
-void SNDi_SetSurroundDecay(int decay);
-
-void SND_SetupChannelPcm(
-    int chnIdx,
-    const void *data,
-    int format,
-    int loop,
-    int loopStart,
-    int loopLen,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_SetupChannelPsg(
-    int chnIdx,
-    int waveDuty,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_SetupChannelNoise(
-    int chnIdx,
-    int volume,
-    int volumeDiv,
-    int timer,
-    int pan
-);
-
-void SND_StopChannel(int chnIdx, int hold);
-
-void SND_SetChannelVolume(int chnIdx, int volume, int volumeDiv);
-void SND_SetChannelPan(int chnIdx, int pan);
-void SND_SetChannelTimer(int chnIdx, int timer);
-
-u32 SND_GetChannelControl(int idx);
-
-// TODO move this function to SND_exChannel.c
-u16 CalcDecayCoeff(int value);
 
 #endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND.h b/arm7/lib/include/SND_global.h
index 196377ed..47bb7a69 100644
--- a/arm7/lib/include/SND.h
+++ b/arm7/lib/include/SND_global.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_SND_H
-#define GUARD_SND_H
+#ifndef GUARD_SND_GLOBAL_H
+#define GUARD_SND_GLOBAL_H
 
 #include "nitro/types.h"
 
@@ -8,8 +8,7 @@ void SND_Disable(void);
 void SND_Shutdown(void);
 void SND_BeginSleep(void);
 void SND_EndSleep(void);
-void SND_SetMasterPan(int pan);
 void SND_SetMasterVolume(int vol);
 void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer);
 
-#endif //GUARD_SND_H
+#endif //GUARD_SND_GLOBAL_H
diff --git a/arm7/lib/include/SND_main.h b/arm7/lib/include/SND_main.h
index fc72ae33..eba3ff44 100644
--- a/arm7/lib/include/SND_main.h
+++ b/arm7/lib/include/SND_main.h
@@ -12,7 +12,5 @@ u32 SND_WaitForIntervalTimer(void);
 void SND_SendWakeupMessage(void);
 void SNDi_LockMutex(void);
 void SNDi_UnlockMutex(void);
-void SND_SetMasterVolume(int vol);
-void SND_SetMasterPan(int pan);
 
 #endif //GUARD_SND_MAIN_H
diff --git a/arm7/lib/src/SND.c b/arm7/lib/src/SND_channel.c
index c4b9d900..99b80a7c 100644
--- a/arm7/lib/src/SND.c
+++ b/arm7/lib/src/SND_channel.c
@@ -1,11 +1,6 @@
-#include "SND.h"
+#include "SND_channel.h"
 
 #include "registers.h"
-#include "syscall.h"
-
-#include "OS_system.h"
-#include "PM.h"
-#include "SND_exChannel.h"
 #include "SND_work.h"
 
 static int sMasterPan = -1;
@@ -154,47 +149,3 @@ static int CalcSurroundDecay(int vol, int pan) {
         return vol * (-sSurroundDecay * (pan - 40) + ((sSurroundDecay + 0x7FFF) << 6)) >> 21;
     }
 }
-
-void SND_Enable(void) {
-    reg_SOUNDCNT_MIX |= 0x80;
-}
-
-void SND_Disable(void) {
-    reg_SOUNDCNT_MIX &= ~0x80;
-}
-
-void SND_Shutdown(void) {
-    SND_Disable();
-
-    for (int i = 0; i < SND_CHANNEL_COUNT; i++) {
-        SND_StopChannel(i, 1);
-    }
-
-    reg_SNDCAPxCNT(0) = 0;
-    reg_SNDCAPxCNT(1) = 0;
-}
-
-void SND_BeginSleep(void) {
-    SND_Disable();
-    SVC_SoundBiasReset(0x80);
-    OS_SpinWait(0x40000);
-    PMi_ResetControl(1);
-    reg_POWCNT2 &= ~1;
-}
-
-void SND_EndSleep(void) {
-    reg_POWCNT2 |= 1;   // enable speakers
-    PMi_SetControl(1);
-    SVC_SoundBiasSet(0x100);
-    OS_SpinWait(0x7AB80); // what does this wait for and how long does it wait?
-    SND_Enable();
-}
-
-void SND_SetMasterVolume(int vol) {
-    reg_SOUNDCNT_VOL = (u8)vol;
-}
-
-void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer) {
-    int masterEnable = (reg_SOUNDCNT_MIX & 0x80) ? 1 : 0;
-    reg_SOUNDCNT_MIX = (u8)((masterEnable << 7) | (outputCh3ToMixer << 5) | (outputCh1ToMixer << 4) | (rightOutputFrom << 2) | (leftOutputFrom));
-}
diff --git a/arm7/lib/src/SND_command.c b/arm7/lib/src/SND_command.c
index ada6161c..bcb43d73 100644
--- a/arm7/lib/src/SND_command.c
+++ b/arm7/lib/src/SND_command.c
@@ -7,10 +7,11 @@
 #include "PXI_fifo.h"
 #include "OS_message.h"
 #include "OS_system.h"
-#include "SND.h"
+#include "SND_channel.h"
 #include "SND_alarm.h"
 #include "SND_capture.h"
 #include "SND_exChannel.h"
+#include "SND_global.h"
 #include "SND_main.h"
 #include "SND_seq.h"
 #include "SND_work.h"
diff --git a/arm7/lib/src/SND_exChannel.c b/arm7/lib/src/SND_exChannel.c
index 7e41aea3..01bd4f3e 100644
--- a/arm7/lib/src/SND_exChannel.c
+++ b/arm7/lib/src/SND_exChannel.c
@@ -1,5 +1,6 @@
 #include "SND_exChannel.h"
 
+#include "SND_channel.h"
 #include "SND_main.h"
 #include "SND_work.h"
 #include "SND_util.h"
@@ -16,6 +17,8 @@ static u32 sWeakLockedChannelMask;
 // TODO remove this extern once we actually know where this table is
 extern u8 sSampleDataShiftTable[4];
 
+static u16 CalcDecayCoeff(int vol);
+
 void SND_ExChannelInit(void) {
     struct SNDExChannel *chn;
     s32 i;
@@ -471,7 +474,7 @@ int SND_GetLfoValue(struct SNDLfo *lfo) {
     }
 }
 
-u16 CalcDecayCoeff(int vol) {
+static u16 CalcDecayCoeff(int vol) {
     if (vol == 127)
         return 0xFFFF;
     else if (vol == 126)
diff --git a/arm7/lib/src/SND_global.c b/arm7/lib/src/SND_global.c
new file mode 100644
index 00000000..0654934f
--- /dev/null
+++ b/arm7/lib/src/SND_global.c
@@ -0,0 +1,53 @@
+#include "SND_global.h"
+
+#include "SND_channel.h"
+#include "SND_work.h"
+
+#include "OS_system.h"
+#include "PM.h"
+#include "registers.h"
+#include "syscall.h"
+
+void SND_Enable(void) {
+    reg_SOUNDCNT_MIX |= 0x80;
+}
+
+void SND_Disable(void) {
+    reg_SOUNDCNT_MIX &= ~0x80;
+}
+
+void SND_Shutdown(void) {
+    SND_Disable();
+
+    for (int i = 0; i < SND_CHANNEL_COUNT; i++) {
+        SND_StopChannel(i, 1);
+    }
+
+    reg_SNDCAPxCNT(0) = 0;
+    reg_SNDCAPxCNT(1) = 0;
+}
+
+void SND_BeginSleep(void) {
+    SND_Disable();
+    SVC_SoundBiasReset(0x80);
+    OS_SpinWait(0x40000);
+    PMi_ResetControl(1);
+    reg_POWCNT2 &= ~1;
+}
+
+void SND_EndSleep(void) {
+    reg_POWCNT2 |= 1;   // enable speakers
+    PMi_SetControl(1);
+    SVC_SoundBiasSet(0x100);
+    OS_SpinWait(0x7AB80); // what does this wait for and how long does it wait?
+    SND_Enable();
+}
+
+void SND_SetMasterVolume(int vol) {
+    reg_SOUNDCNT_VOL = (u8)vol;
+}
+
+void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer) {
+    int masterEnable = (reg_SOUNDCNT_MIX & 0x80) ? 1 : 0;
+    reg_SOUNDCNT_MIX = (u8)((masterEnable << 7) | (outputCh3ToMixer << 5) | (outputCh1ToMixer << 4) | (rightOutputFrom << 2) | (leftOutputFrom));
+}
diff --git a/arm7/lib/src/SND_main.c b/arm7/lib/src/SND_main.c
index 96dcdc78..24e81d2c 100644
--- a/arm7/lib/src/SND_main.c
+++ b/arm7/lib/src/SND_main.c
@@ -2,11 +2,11 @@
 
 #include "global.h"
 
-#include "SND.h"
 #include "SND_alarm.h"
 #include "SND_capture.h"
 #include "SND_command.h"
 #include "SND_exChannel.h"
+#include "SND_global.h"
 #include "SND_seq.h"
 #include "SND_util.h"
 #include "SND_work.h"
diff --git a/arm7/lib/src/SND_work.c b/arm7/lib/src/SND_work.c
index 3f0d10f0..d40ccdc6 100644
--- a/arm7/lib/src/SND_work.c
+++ b/arm7/lib/src/SND_work.c
@@ -1,5 +1,6 @@
 #include "SND_work.h"
 
+#include "SND_channel.h"
 #include "SND_exChannel.h"
 #include "SND_capture.h"