Fix errors in sub/lib/src

pret · May 29, 2023 · 3695578 · 3695578
1 parent c3ae6df
commit 3695578
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/lib/NitroSDK/src/os/os_thread.c b/lib/NitroSDK/src/os/os_thread.c
@@ -61,7 +61,7 @@ void OSi_ExitThread_Destroy(void);
 void OSi_CancelThreadAlarmForSleep(OSThread *thread);
 void OS_KillThreadWithPriority(OSThread *thread, void *arg, u32 prio);
 
-int OSi_GetUnusedThreadId(void) {
+s32 OSi_GetUnusedThreadId(void) {
     ++OSi_ThreadIdCount;
     return OSi_ThreadIdCount;
 }

diff --git a/lib/include/nitro/os/thread.h b/lib/include/nitro/os/thread.h
@@ -6,7 +6,7 @@
 
 #define SDK_THREAD_INFINITY
 
-int OSi_GetUnusedThreadId(void);
+s32 OSi_GetUnusedThreadId(void);
 OSThread *OSi_RemoveLinkFromQueue(OSThreadQueue *queue);
 OSThread *OSi_RemoveSpecifiedLinkFromQueue(OSThreadQueue *queue, OSThread *thread);
 OSMutex *OSi_RemoveMutexLinkFromQueue(OSMutexQueue *queue);
@@ -36,5 +36,6 @@ OSSwitchThreadCallback OS_SetSwitchThreadCallback(OSSwitchThreadCallback callbac
 u32 OS_DisableScheduler(void);
 u32 OS_EnableScheduler(void);
 void OS_SetThreadDestructor(OSThread *thread, OSThreadDestructor dtor);
+void OSi_InsertLinkToQueue(OSThreadQueue *queue, OSThread *thread);
 
 #endif //NITRO_OS_THREAD_H_
diff --git a/lib/include/nitro/pad/ARM7/xyButton.h b/lib/include/nitro/pad/ARM7/xyButton.h
@@ -2,5 +2,6 @@
 #define NITRO_PAD_XYBUTTON_H_
 
 extern BOOL PADi_XYButtonAvailable;
+BOOL PAD_InitXYButton(void);
 
 #endif //NITRO_PAD_XYBUTTON_H_
diff --git a/sub/lib/src/OS_init.c b/sub/lib/src/OS_init.c
@@ -1,4 +1,5 @@
 #include <nitro/hw/consts.h>
+#include <nitro/os/init.h>
 
 extern void PXI_Init(void);
 extern void OS_InitThread(void);

diff --git a/sub/lib/src/OS_irqHandler.c b/sub/lib/src/OS_irqHandler.c
@@ -1,6 +1,7 @@
 #include <nitro/os/interrupt.h>
 #include <nitro/os/system.h>
 #include <nitro/os/thread.h>
+#include <nitro/os/irqHandler.h>
 #include <nitro/os/irqTable.h>
 #include <nitro/os/context.h>
 

diff --git a/sub/lib/src/OS_thread.c b/sub/lib/src/OS_thread.c
@@ -37,13 +37,15 @@ static void OSi_ExitThread(void *arg);
 void OSi_ExitThread_Destroy(void);
 static void OSi_SleepAlarmCallback(void *arg);
 
+#pragma warn_no_side_effect off
 static inline s32 OSi_GetUnusedThreadId(void)
 {
     OSi_SystemStackBuffer;
     killThreadStatus;
     exitThreadStatus;
     return ++OSi_ThreadIdCount;
 }
+#pragma warn_no_side_effect on
 
 static inline void OS_RescheduleThread(void)
 {