summaryrefslogtreecommitdiff
path: root/arm7/lib/src
diff options
context:
space:
mode:
authorMichael Panzlaff <michael.panzlaff@fau.de>2021-07-08 13:38:52 +0200
committerMichael Panzlaff <michael.panzlaff@fau.de>2021-08-25 18:03:47 +0200
commit6e37656a84a76cd315b870a8002e2fec0fa0f00e (patch)
tree6b6f7209646361ac983fe1b131f69b54c6e0fb35 /arm7/lib/src
parent62059593a2d5dc7369ff898e0664fa0ae82c577c (diff)
minor fixes
Diffstat (limited to 'arm7/lib/src')
-rw-r--r--arm7/lib/src/SND_lockChannel.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/arm7/lib/src/SND_lockChannel.c b/arm7/lib/src/SND_lockChannel.c
index 92e04e5e..608ed67a 100644
--- a/arm7/lib/src/SND_lockChannel.c
+++ b/arm7/lib/src/SND_lockChannel.c
@@ -8,7 +8,9 @@
u32 sLockedChannelMask;
u32 sWeakLockedChannelMask;
-void SND_StopUnlockedChannel(u32 channelMask) {
+void SND_StopUnlockedChannel(u32 channelMask, u32 weak) {
+ (void)weak;
+
struct SNDExChannel *chn;
for (int i = 0; i < SND_CHANNEL_COUNT && channelMask != 0; i++, channelMask >>= 1) {
@@ -31,7 +33,7 @@ void SND_StopUnlockedChannel(u32 channelMask) {
}
}
-void SND_LockChannel(u32 channelMask, u32 locked) {
+void SND_LockChannel(u32 channelMask, u32 weak) {
struct SNDExChannel *chn;
u32 j = channelMask;
int i = 0;
@@ -55,23 +57,23 @@ void SND_LockChannel(u32 channelMask, u32 locked) {
chn->flags.active = 0;
}
- if (locked & 1) {
+ if (weak & 1) {
sWeakLockedChannelMask |= channelMask;
} else {
sLockedChannelMask |= channelMask;
}
}
-void SND_UnlockChannel(u32 channelMask, u32 locked) {
- if (locked & 1) {
+void SND_UnlockChannel(u32 channelMask, u32 weak) {
+ if (weak & 1) {
sWeakLockedChannelMask &= ~channelMask;
} else {
sLockedChannelMask &= ~channelMask;
}
}
-u32 SND_GetLockedChannel(u32 locked) {
- if (locked & 1) {
+u32 SND_GetLockedChannel(u32 weak) {
+ if (weak & 1) {
return sWeakLockedChannelMask;
} else {
return sLockedChannelMask;