arm7: merge SND_channel into SND_exChannel

2 files changed, 42 insertions, 51 deletions

diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h
deleted file mode 100644
index 9e015beb..00000000
--- a/arm7/lib/include/SND_channel.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#ifndef GUARD_SND_CHANNEL_H
-#define GUARD_SND_CHANNEL_H
-
-#include "nitro/types.h"
-
-#include "SND_exChannel.h"
-
-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_CHANNEL_H
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index 03fd4b41..a2d19971 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -42,5 +42,47 @@ 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