decompile SND_alarm and SND_work

6 files changed, 130 insertions, 9 deletions

diff --git a/arm7/lib/include/SND_alarm.h b/arm7/lib/include/SND_alarm.h
index 195b90bb..1eca6fe8 100644
--- a/arm7/lib/include/SND_alarm.h
+++ b/arm7/lib/include/SND_alarm.h
@@ -2,11 +2,11 @@
 #define GUARD_SND_ALARM_H
 
 #include "global.h"
-#include "SND_alarm_shared.h"
+#include "nitro/SND_alarm_shared.h"
 
-void SND_StopAlarm(u32 idx);
-void SND_StartAlarm(u32 idx);
-void SND_SetupAlarm();
-void SND_AlarmInit();
+void SND_AlarmInit(void);
+void SND_SetupAlarm(s32 idx, OSTick tick, OSTick period, u32 id);
+void SND_StartAlarm(s32 idx);
+void SND_StopAlarm(s32 idx);
 
-#endif //GUARD_SND_ALARM_H
\ No newline at end of file
+#endif //GUARD_SND_ALARM_H
diff --git a/arm7/lib/include/SND_capture.h b/arm7/lib/include/SND_capture.h
new file mode 100644
index 00000000..78a09efa
--- /dev/null
+++ b/arm7/lib/include/SND_capture.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_SND_CAPTURE_H
+#define GUARD_SND_CAPTURE_H
+
+BOOL SND_IsCaptureActive(s32 idx);
+
+#endif //GUARD_SND_CAPTURE_H
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index 05fbe3d7..b9545435 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -3,6 +3,6 @@
 
 #include "global.h"
 
-bool SND_IsChannelActive(u32 idx);
+BOOL SND_IsChannelActive(s32 idx);
 
-#endif //GUARD_SND_EXCHANNEL_H
\ No newline at end of file
+#endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND_work.h b/arm7/lib/include/SND_work.h
index 9b834c6c..49933fc7 100644
--- a/arm7/lib/include/SND_work.h
+++ b/arm7/lib/include/SND_work.h
@@ -1,4 +1,13 @@
 #ifndef GUARD_SND_WORK_H
 #define GUARD_SND_WORK_H
 
-#endif //GUARD_SND_WORK_H
\ No newline at end of file
+#include "nitro/SND_work_shared.h"
+
+extern struct SNDWork SNDi_Work;
+extern struct SNDSharedWork *SNDi_SharedWork;
+
+void SND_SetPlayerLocalVariable(u32 player, u32 var, s16 value);
+void SND_SetPlayerGlobalVariable(u32 var, s16 value);
+void SND_UpdateSharedWork(void);
+
+#endif //GUARD_SND_WORK_H
diff --git a/arm7/lib/src/SND_alarm.c b/arm7/lib/src/SND_alarm.c
new file mode 100644
index 00000000..8eef3e19
--- /dev/null
+++ b/arm7/lib/src/SND_alarm.c
@@ -0,0 +1,70 @@
+#include "SND_alarm.h"
+
+#include "SND_work.h"
+#include "OS_alarm.h"
+#include "OS_tick.h"
+#include "PXI_fifo.h"
+
+static void AlarmHandler(void *msg);
+
+void SND_AlarmInit(void) {
+    for (s32 i = 0; i < SND_ALARM_COUNT; i++) {
+        SNDi_Work.alarms[i].enable = 0;
+        SNDi_Work.alarms[i].id = 0;
+    }
+}
+
+void SND_SetupAlarm(s32 idx, OSTick tick, OSTick period, u32 id) {
+    struct SNDAlarm *alarm = &SNDi_Work.alarms[idx];
+
+    if (alarm->enable) {
+        OS_CancelAlarm(&alarm->alarm);
+        alarm->enable = 0;
+    }
+
+    alarm->tick = tick;
+    alarm->period = period;
+    alarm->id = (u8)id;
+}
+
+void SND_StartAlarm(s32 idx) {
+    OSTick tick;
+    OSTick period;
+    
+    struct SNDAlarm *alarm = &SNDi_Work.alarms[idx];
+
+    if (alarm->enable != 0) {
+        OS_CancelAlarm(&alarm->alarm);
+        alarm->enable = 0;
+    }
+
+    tick = alarm->tick;
+    period = alarm->period;
+    s32 arg = idx | (alarm->id << 8);
+
+    OS_CreateAlarm(&alarm->alarm);
+
+    if (period == 0) {
+        OS_SetAlarm(&alarm->alarm, tick, AlarmHandler, (void *)arg);
+    } else {
+        OS_SetPeriodicAlarm(&alarm->alarm, tick + OS_GetTick(), period, AlarmHandler, (void *)arg);
+    }
+
+    alarm->enable = 1;
+}
+
+void SND_StopAlarm(s32 idx) {
+    struct SNDAlarm *alarm = &SNDi_Work.alarms[idx];
+
+    if (alarm->enable != 0) {
+        OS_CancelAlarm(&alarm->alarm);
+        alarm->id++;
+        alarm->enable = 0;
+    }
+}
+
+static void AlarmHandler(void *msg) {
+    while (PXI_SendWordByFifo(7, (u32)msg, 0) < 0) {
+        // nothing
+    }
+}
diff --git a/arm7/lib/src/SND_work.c b/arm7/lib/src/SND_work.c
new file mode 100644
index 00000000..4b23056d
--- /dev/null
+++ b/arm7/lib/src/SND_work.c
@@ -0,0 +1,36 @@
+#include "SND_work.h"
+
+#include "SND_exChannel.h"
+#include "SND_capture.h"
+
+struct SNDWork SNDi_Work;
+struct SNDSharedWork *SNDi_SharedWork;
+
+void SND_SetPlayerLocalVariable(u32 player, u32 var, s16 value) {
+    SNDi_SharedWork->players[player].localVars[var] = value;
+}
+
+void SND_SetPlayerGlobalVariable(u32 var, s16 value) {
+    SNDi_SharedWork->globalVars[var] = value;
+}
+
+void SND_UpdateSharedWork(void) {
+    u16 channelActiveMask = 0;
+    u16 channelCaptureMask = 0;
+
+    if (SNDi_SharedWork == NULL)
+        return;
+    
+    for (s32 i = 0; i < SND_CHANNEL_COUNT; i++) {
+        if (SND_IsChannelActive(i))
+            channelActiveMask |= 1 << i;
+    }
+
+    if (SND_IsCaptureActive(0))
+        channelCaptureMask |= 0x1;
+    if (SND_IsCaptureActive(1))
+        channelCaptureMask |= 0x2;
+
+    SNDi_SharedWork->channelStatus = channelActiveMask;
+    SNDi_SharedWork->captureStatus = channelCaptureMask;
+}