summaryrefslogtreecommitdiff
path: root/arm9/lib
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/lib')
-rw-r--r--arm9/lib/NitroSDK/include/PXI_fifo.h23
-rw-r--r--arm9/lib/NitroSDK/include/SND_bank.h79
-rw-r--r--arm9/lib/NitroSDK/include/SND_command.h50
-rw-r--r--arm9/lib/NitroSDK/include/SND_main.h14
-rw-r--r--arm9/lib/NitroSDK/include/SND_work.h45
-rw-r--r--arm9/lib/libnns/src/NNS_FND_allocator.c10
-rw-r--r--arm9/lib/libnns/src/NNS_FND_expheap.c26
-rw-r--r--arm9/lib/libnns/src/NNS_FND_heapcommon.c10
-rw-r--r--arm9/lib/libnns/src/NNS_FND_list.c16
9 files changed, 34 insertions, 239 deletions
diff --git a/arm9/lib/NitroSDK/include/PXI_fifo.h b/arm9/lib/NitroSDK/include/PXI_fifo.h
index b1ca33f3..815da961 100644
--- a/arm9/lib/NitroSDK/include/PXI_fifo.h
+++ b/arm9/lib/NitroSDK/include/PXI_fifo.h
@@ -4,29 +4,6 @@
#include "nitro/PXI_fifo_shared.h"
#include "nitro/types.h"
-typedef enum
-{
- PXI_FIFO_SUCCESS = 0,
- PXI_FIFO_FAIL_SEND_ERR = -1,
- PXI_FIFO_FAIL_SEND_FULL = -2,
- PXI_FIFO_FAIL_RECV_ERR = -3,
- PXI_FIFO_FAIL_RECV_EMPTY = -4,
- PXI_FIFO_NO_CALLBACK_ENTRY = -5
-} PXIFifoStatus;
-
-typedef void (*PXIFifoCallback) (PXIFifoTag tag, u32 data, BOOL err);
-
-typedef union
-{
- struct
- {
- u32 tag:5;
- u32 err:1;
- u32 data:26;
- } e;
- u32 raw;
-} PXIFifoMessage;
-
void PXI_InitFifo(void);
void PXI_SetFifoRecvCallback(s32 fifotag, PXIFifoCallback callback);
BOOL PXI_IsCallbackReady(s32 fifotag, PXIProc proc);
diff --git a/arm9/lib/NitroSDK/include/SND_bank.h b/arm9/lib/NitroSDK/include/SND_bank.h
index b9000d57..58fd8307 100644
--- a/arm9/lib/NitroSDK/include/SND_bank.h
+++ b/arm9/lib/NitroSDK/include/SND_bank.h
@@ -4,84 +4,7 @@
#include "global.h"
#include "SND_main.h"
-
-#define SND_INST_ILLEGAL 0
-#define SND_INST_PCM 1
-#define SND_INST_PSG 2
-#define SND_INST_NOISE 3
-#define SND_INST_DIRECTPCM 4
-#define SND_INST_DUMMY 5
-#define SND_INST_DRUM_TABLE 16
-#define SND_INST_KEY_SPLIT 17
-
-#define SND_BANK_MAX_WAVEARC 4
-#define SND_INST_MAX_KEYSPLIT 8
-
-#define SND_INST_OFFSET_TYPE(off) ((u8)off)
-#define SND_INST_OFFSET_NORMAL(bank, off) ((struct SNDInstParam *)((u8 *)bank + (u32)(off >> 8)))
-#define SND_INST_OFFSET_DRUMS(bank, off) ((struct SNDDrumSet *)((u8 *)bank + (u32)(off >> 8)))
-#define SND_INST_OFFSET_KEYSPL(bank, off) ((struct SNDKeySplit *)((u8 *)bank + (u32)(off >> 8)))
-
-struct SNDWaveArc;
-
-struct SNDWaveArcLink {
- struct SNDWaveArc *waveArc; // 0x0
- struct SNDWaveArcLink *waveArcLLnext; // 0x4
-}; // size = 0x8
-
-struct SNDBankData {
- struct SNDBinaryFileHeader fileHeader; // 0x00
- struct SNDBinaryBlockHeader blockHeader; // 0x10
- struct SNDWaveArcLink waveArcLinks[SND_BANK_MAX_WAVEARC]; // 0x18
- u32 instCount; // 0x38
- u32 instOffsets[]; // 0x3C
-}; // size = 0x40
-
-struct SNDWaveArc {
- struct SNDBinaryFileHeader fileHeader; // 0x00
- struct SNDBinaryBlockHeader blockHeader; // 0x10
- struct SNDWaveArcLink *waveArcLLHead; // 0x18
- u8 unk_1C[28]; // 0x1C
- u32 waveCount; // 0x38
- u32 waveOffsets[]; // 0x3C
-}; // size = 0x3C
-
-struct SNDInstParam {
- u16 wave[2]; // 0x0
- u8 rootKey; // 0x4
- u8 envAttack; // 0x5
- u8 envDecay; // 0x6
- u8 envSustain; // 0x7
- u8 envRelease; // 0x8
- u8 pan; // 0x9
-}; // size = 0xA
-
-struct SNDInstData {
- u8 type; // 0x0
- u8 unk_1; // 0x1
- struct SNDInstParam param; // 0x2
-}; // size = 0xC
-
-struct SNDKeySplit {
- u8 key[SND_INST_MAX_KEYSPLIT]; // 0x0
- struct SNDInstData instruments[]; // 0x8
-}; // size = 0x8
-
-struct SNDDrumSet {
- u8 minKey;
- u8 maxKey;
- struct SNDInstData instruments[];
-}; // size = 0x2
-
-struct SNDInstPos {
- u32 program; // 0x0
- u32 index; // 0x4
-}; // size = 0x8
-
-struct SNDWaveData {
- struct SNDWaveParam param; // 0x0
- u8 sampleData[]; // 0xC
-}; // size = 0xC
+#include "nitro/SND_bank_shared.h"
void SND_AssignWaveArc(struct SNDBankData *bankData, s32 index, struct SNDWaveArc *waveArc);
void SND_DestroyBank(struct SNDBankData *bankData);
diff --git a/arm9/lib/NitroSDK/include/SND_command.h b/arm9/lib/NitroSDK/include/SND_command.h
index ff392833..4d44c583 100644
--- a/arm9/lib/NitroSDK/include/SND_command.h
+++ b/arm9/lib/NitroSDK/include/SND_command.h
@@ -1,55 +1,9 @@
#ifndef GUARD_SND_COMMAND_H
#define GUARD_SND_COMMAND_H
-#include "global.h"
+#include "nitro/SND_command_shared.h"
-#define SND_CMD_COUNT 256
-#define SND_CMD_ARG_MAX 4
-
-#define SND_CMD_FLAG_NOBLOCK 0x0
-#define SND_CMD_FLAG_BLOCK 0x1
-#define SND_CMD_FLAG_IMMEDIATE 0x2
-
-#define SND_CMD_START_SEQ 0x00
-#define SND_CMD_STOP_SEQ 0x01
-#define SND_CMD_PREPARE_SEQ 0x02
-#define SND_CMD_START_PREPARED_SEQ 0x03
-#define SND_CMD_PAUSE_SEQ 0x04
-#define SND_CMD_SKIP_SEQ 0x05
-#define SND_CMD_PLAYER_PARAM 0x06
-#define SND_CMD_TRACK_PARAM 0x07
-#define SND_CMD_MUTE_TRACK 0x08
-#define SND_CMD_ALLOCATABLE_CHANNEL 0x09
-#define SND_CMD_PLAYER_LOCAL_VAR 0x0A
-#define SND_CMD_PLAYER_GLOBAL_VAR 0x0B
-#define SND_CMD_START_TIMER 0x0C
-#define SND_CMD_STOP_TIMER 0x0D
-#define SND_CMD_SETUP_CHANNEL_PCM 0x0E
-#define SND_CMD_SETUP_CHANNEL_PSG 0x0F
-#define SND_CMD_SETUP_CHANNEL_NOISE 0x10
-#define SND_CMD_SETUP_CAPTURE 0x11
-#define SND_CMD_SETUP_ALARM 0x12
-#define SND_CMD_CHANNEL_TIMER 0x13
-#define SND_CMD_CHANNEL_VOLUME 0x14
-#define SND_CMD_CHANNEL_PAN 0x15
-#define SND_CMD_SURROUND_DECAY 0x16
-#define SND_CMD_MASTER_VOLUME 0x17
-#define SND_CMD_MASTER_PAN 0x18
-#define SND_CMD_OUTPUT_SELECTOR 0x19
-#define SND_CMD_LOCK_CHANNEL 0x1A
-#define SND_CMD_UNLOCK_CHANNEL 0x1B
-#define SND_CMD_STOP_UNLOCKED_CHANNEL 0x1C
-#define SND_CMD_SET_SHARED_WORK 0x1D
-#define SND_CMD_INVALIDATE_SEQ 0x1E
-#define SND_CMD_INVALIDATE_BANK 0x1F
-#define SND_CMD_INVALIDATE_WAVE 0x20
-#define SND_CMD_READ_DRIVER_INFO 0x21
-
-struct SNDCommand {
- struct SNDCommand *llNext; // 0x0
- s32 id; // 0x4
- u32 arg[SND_CMD_ARG_MAX]; // 0x8
-}; // size = 0x18
+#include "nitro/types.h"
void SND_CommandInit(void);
const struct SNDCommand *SND_RecvCommandReply(u32 flags);
diff --git a/arm9/lib/NitroSDK/include/SND_main.h b/arm9/lib/NitroSDK/include/SND_main.h
index 8fa9364e..aa476bae 100644
--- a/arm9/lib/NitroSDK/include/SND_main.h
+++ b/arm9/lib/NitroSDK/include/SND_main.h
@@ -9,18 +9,4 @@ void SNDi_UnlockMutex(void);
void SNDi_LockMutex(void);
void SND_Init(void);
-struct SNDBinaryFileHeader {
- s8 signature[4]; // 0x0
- u16 byteOrder; // 0x4
- u16 version; // 0x6
- u32 fileSize; // 0x8
- u16 headerSize; // 0xC
- u16 dataBlocks; // 0xE
-}; // size = 0x10
-
-typedef struct SNDBinaryBlockHeader {
- u32 type; // 0x0
- u32 size; // 0x4
-} SNDBinaryBlockHeader; // size = 0x8
-
#endif // GUARD_SND_MAIN_H
diff --git a/arm9/lib/NitroSDK/include/SND_work.h b/arm9/lib/NitroSDK/include/SND_work.h
index a8a3d62b..f3ed08c8 100644
--- a/arm9/lib/NitroSDK/include/SND_work.h
+++ b/arm9/lib/NitroSDK/include/SND_work.h
@@ -6,51 +6,6 @@
#include "SND_main.h"
#include "nitro/SND_work_shared.h"
-struct SNDDriverInfo {
- struct SNDWork work; // 0x0000
- u32 channelControls[SND_CHANNEL_COUNT]; // 0x1180
- struct SNDWork *workPtr; // 0x11C0
- u32 lockedChannels; // 0x11C4
- u8 unk_XXX[24]; // 0x11C8
-}; // size = 0x11E0
-
-struct SNDChannelInfo {
- struct {
- BOOL active : 1;
- BOOL locked: 1;
- } flags; // 0x0
- u16 volume; // 0x4
- u8 pan; // 0x6
- u8 unk_7; // 0x7
- s32 envStatus; // 0x8
-}; // size = 0xC
-
-struct SNDPlayerInfo {
- struct {
- BOOL active : 1;
- BOOL paused : 1;
- } flags; // 0x0
- u16 trackBitMask; // 0x4
- u16 tempo; // 0x6
- u8 volume; // 0x8
- u8 unk_9[3]; // 0x9
-}; // size = 0xC
-
-struct SNDTrackInfo {
- u16 program; // 0x0
- u8 volume; // 0x2
- u8 expression; // 0x3
-
- s8 pitchBend; // 0x4
- u8 bendRange; // 0x5
- u8 pan; // 0x6
- s8 transpose; // 0x7
-
- u8 unk_8; // 0x8
- u8 chnCount; // 0x9
- u8 channel[SND_CHANNEL_COUNT]; // 0xA
-}; // size = 0x1A
-
u32 SND_GetPlayerStatus(void);
u16 SND_GetChannelStatus(void);
//u16 SND_GetCaptureStatus(void);
diff --git a/arm9/lib/libnns/src/NNS_FND_allocator.c b/arm9/lib/libnns/src/NNS_FND_allocator.c
index 31d0eb70..c459c3d0 100644
--- a/arm9/lib/libnns/src/NNS_FND_allocator.c
+++ b/arm9/lib/libnns/src/NNS_FND_allocator.c
@@ -2,27 +2,27 @@
#include "NNS_FND_allocator.h"
#include "NNS_FND_expheap.h"
-void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)
+ARM_FUNC void *AllocatorAllocForExpHeap(NNSFndAllocator * pAllocator, u32 size)
{
return NNS_FndAllocFromExpHeapEx(pAllocator->pHeap, size, pAllocator->heapParam1);
}
-void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)
+ARM_FUNC void AllocatorFreeForExpHeap(NNSFndAllocator * pAllocator, void *memBlock)
{
NNS_FndFreeToExpHeap(pAllocator->pHeap, memBlock);
}
-void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)
+ARM_FUNC void *NNS_FndAllocFromAllocator(NNSFndAllocator * pAllocator, u32 size)
{
return pAllocator->pFunc->pfAlloc(pAllocator, size);
}
-void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)
+ARM_FUNC void NNS_FndFreeToAllocator(NNSFndAllocator * pAllocator, void *memBlock)
{
pAllocator->pFunc->pfFree(pAllocator, memBlock);
}
-void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)
+ARM_FUNC void NNS_FndInitAllocatorForExpHeap(NNSFndAllocator * pAllocator, NNSFndHeapHandle pHeap, int alignment)
{
static const NNSFndAllocatorFunc pFunc = {AllocatorAllocForExpHeap, AllocatorFreeForExpHeap};
pAllocator->pFunc = &pFunc;
diff --git a/arm9/lib/libnns/src/NNS_FND_expheap.c b/arm9/lib/libnns/src/NNS_FND_expheap.c
index 15657c43..62a4deb4 100644
--- a/arm9/lib/libnns/src/NNS_FND_expheap.c
+++ b/arm9/lib/libnns/src/NNS_FND_expheap.c
@@ -66,13 +66,13 @@ static inline NNSiFndHeapHead* GetHeapHeadPtrFromExpHeapHead(NNSiFndExpHeapHead*
return SubU32ToPtr(pEHHead, sizeof(NNSiFndHeapHead));
}
-void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block)
+ARM_FUNC void GetRegionOfMBlock(NNSiMemRegion* region, NNSiFndExpHeapMBlockHead* block)
{
region->start = SubU32ToPtr(block, GetAlignmentForMBlock(block));
region->end = GetMBlockEndAddr(block);
}
-NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block)
+ARM_FUNC NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* block)
{
NNSiFndExpHeapMBlockHead* const prev = block->pMBHeadPrev;
NNSiFndExpHeapMBlockHead* const next = block->pMBHeadNext;
@@ -98,7 +98,7 @@ NNSiFndExpHeapMBlockHead* RemoveMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHea
return prev;
}
-NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev)
+ARM_FUNC NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlockHead* target, NNSiFndExpHeapMBlockHead* prev)
{
NNSiFndExpHeapMBlockHead* next;
target->pMBHeadPrev = prev;
@@ -125,7 +125,7 @@ NNSiFndExpHeapMBlockHead* InsertMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHea
return target;
}
-NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature)
+ARM_FUNC NNSiFndExpHeapMBlockHead* InitMBlock(const NNSiMemRegion* pRegion, u16 signature)
{
NNSiFndExpHeapMBlockHead* block = pRegion->start;
block->signature = signature;
@@ -141,7 +141,7 @@ static inline NNSiFndExpHeapMBlockHead* InitFreeMBlock(const NNSiMemRegion* regi
return InitMBlock(region, 0x4652);
}
-NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag)
+ARM_FUNC NNSiFndHeapHead* InitExpHeap(void* startAddress, void* endAddress, u16 optFlag)
{
NNSiFndHeapHead* pHeapHd = (NNSiFndHeapHead*)startAddress;
NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);
@@ -170,7 +170,7 @@ static inline void AppendMBlock(NNSiFndExpMBlockList* list, NNSiFndExpHeapMBlock
(void) InsertMBlock(list, block, list->tail);
}
-void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction)
+ARM_FUNC void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBlockHead* pMBHeadFree, void* mblock, u32 size, u16 direction)
{
NNSiMemRegion freeRgnT;
NNSiMemRegion freeRgnB;
@@ -218,7 +218,7 @@ void* AllocUsedBlockFromFreeBlock(NNSiFndExpHeapHead* pEHHead, NNSiFndExpHeapMBl
return mblock;
}
-void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
+ARM_FUNC void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
{
NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);
const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0;
@@ -248,7 +248,7 @@ void* AllocFromHead(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 0);
}
-void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
+ARM_FUNC void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
{
NNSiFndExpHeapHead* pExpHeapHd = GetExpHeapHeadPtrFromHeapHead(pHeapHd);
const BOOL bAllocFirst = GetAllocMode(pExpHeapHd) == 0;
@@ -278,7 +278,7 @@ void* AllocFromTail(NNSiFndHeapHead* pHeapHd, u32 size, int alignment)
return AllocUsedBlockFromFreeBlock(pExpHeapHd, pMBlkHdFound, foundMBlock, size, 1);
}
-BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)
+ARM_FUNC BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)
{
NNSiFndExpHeapMBlockHead* pBlkPtrFree = NULL;
NNSiMemRegion freeRgn = *pRegion;
@@ -308,7 +308,7 @@ BOOL RecycleRegion(NNSiFndExpHeapHead* pEHHead, const NNSiMemRegion* pRegion)
return TRUE;
}
-NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag)
+ARM_FUNC NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFlag)
{
void* endAddress = NNSi_FndRoundDownPtr(AddU32ToPtr(startAddress, size), 4);
startAddress = NNSi_FndRoundUpPtr(startAddress, 4);
@@ -317,12 +317,12 @@ NNSFndHeapHandle NNS_FndCreateExpHeapEx(void *startAddress, u32 size, u16 optFla
return InitExpHeap(startAddress, endAddress, optFlag);
}
-void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle)
+ARM_FUNC void NNS_FndDestroyExpHeap(NNSFndHeapHandle handle)
{
NNSi_FndFinalizeHeap(handle);
}
-void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment)
+ARM_FUNC void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment)
{
if (size == 0)
size = 1;
@@ -334,7 +334,7 @@ void* NNS_FndAllocFromExpHeapEx(NNSFndHeapHandle handle, u32 size, int alignment
}
/*
-u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size)
+ARM_FUNC u32 NNS_FndResizeForMBlockExpHeap(NNSFndHeapHandle heap, void *memBlock, u32 size)
{
NNSiFndExpHeapHead* pEHHead;
NNSiFndExpHeapMBlockHead* pMBHead;
diff --git a/arm9/lib/libnns/src/NNS_FND_heapcommon.c b/arm9/lib/libnns/src/NNS_FND_heapcommon.c
index 07b8e9cf..73646030 100644
--- a/arm9/lib/libnns/src/NNS_FND_heapcommon.c
+++ b/arm9/lib/libnns/src/NNS_FND_heapcommon.c
@@ -5,9 +5,9 @@
BOOL sRootListInitialized;
NNSFndList sRootList;
-void *NNS_FndGetNextListObject(NNSFndList *, void *);
+ARM_FUNC void *NNS_FndGetNextListObject(NNSFndList *, void *);
-static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock)
+ARM_FUNC static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBlock)
{
NNSiFndHeapHead * pHead = NULL;
@@ -24,7 +24,7 @@ static NNSiFndHeapHead* FindContainHeap(NNSFndList * pList, const void * memBloc
return NULL;
}
-static NNSFndList* FindListContainHeap(const void * memBlock)
+ARM_FUNC static NNSFndList* FindListContainHeap(const void * memBlock)
{
NNSFndList* ret = &sRootList;
NNSiFndHeapHead* pHead = FindContainHeap(&sRootList, memBlock);
@@ -33,7 +33,7 @@ static NNSFndList* FindListContainHeap(const void * memBlock)
return ret;
}
-void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag)
+ARM_FUNC void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart, void* heapEnd, u16 optionFlag)
{
pHead->signature = signature;
pHead->heapStart = heapStart;
@@ -49,7 +49,7 @@ void NNSi_FndInitHeapHead(NNSiFndHeapHead *pHead, u32 signature, void* heapStart
NNS_FndAppendListObject(FindListContainHeap(pHead), pHead);
}
-void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead)
+ARM_FUNC void NNSi_FndFinalizeHeap(NNSiFndHeapHead *pHead)
{
NNS_FndRemoveListObject(FindListContainHeap(pHead), pHead);
}
diff --git a/arm9/lib/libnns/src/NNS_FND_list.c b/arm9/lib/libnns/src/NNS_FND_list.c
index d4dd7620..fdab8188 100644
--- a/arm9/lib/libnns/src/NNS_FND_list.c
+++ b/arm9/lib/libnns/src/NNS_FND_list.c
@@ -3,7 +3,7 @@
#define OBJ_TO_LINK(list, obj) ((NNSFndLink*)((void*)(obj) + (list)->offset))
-void NNS_FndInitList(NNSFndList* list, s32 alignment)
+ARM_FUNC void NNS_FndInitList(NNSFndList* list, s32 alignment)
{
list->headObject = NULL;
list->tailObject = NULL;
@@ -11,7 +11,7 @@ void NNS_FndInitList(NNSFndList* list, s32 alignment)
list->offset = (u16)alignment;
}
-static void SetFirstObject(NNSFndList* list, void* object)
+ARM_FUNC static void SetFirstObject(NNSFndList* list, void* object)
{
NNSFndLink* tail = OBJ_TO_LINK(list, object);
tail->nextObject = NULL;
@@ -21,7 +21,7 @@ static void SetFirstObject(NNSFndList* list, void* object)
list->numObjects++;
}
-void NNS_FndAppendListObject(NNSFndList* list, void* object)
+ARM_FUNC void NNS_FndAppendListObject(NNSFndList* list, void* object)
{
if (list->headObject == NULL)
{
@@ -38,7 +38,7 @@ void NNS_FndAppendListObject(NNSFndList* list, void* object)
}
}
-void NNS_FndPrependListObject(NNSFndList* list, void* object)
+ARM_FUNC void NNS_FndPrependListObject(NNSFndList* list, void* object)
{
if (list->headObject == NULL)
{
@@ -55,7 +55,7 @@ void NNS_FndPrependListObject(NNSFndList* list, void* object)
}
}
-void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)
+ARM_FUNC void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)
{
if (where == NULL)
{
@@ -79,7 +79,7 @@ void NNS_FndInsertListObject(NNSFndList* list, void* where, void* object)
}
}
-void NNS_FndRemoveListObject(NNSFndList* list, void* object)
+ARM_FUNC void NNS_FndRemoveListObject(NNSFndList* list, void* object)
{
NNSFndLink* node = OBJ_TO_LINK(list, object);
if (node->prevObject == NULL)
@@ -103,7 +103,7 @@ void NNS_FndRemoveListObject(NNSFndList* list, void* object)
list->numObjects--;
}
-void * NNS_FndGetNextListObject(NNSFndList* list, void* object)
+ARM_FUNC void * NNS_FndGetNextListObject(NNSFndList* list, void* object)
{
if (object == NULL)
{
@@ -115,7 +115,7 @@ void * NNS_FndGetNextListObject(NNSFndList* list, void* object)
}
}
-void * NNS_FndGetPrevListObject(NNSFndList* list, void* object)
+ARM_FUNC void * NNS_FndGetPrevListObject(NNSFndList* list, void* object)
{
if (object == NULL)
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 08:59:39 +0000