From 4c5341831c0af7573552629a76b9ef5baadc81a9 Mon Sep 17 00:00:00 2001 From: Demki Date: Fri, 1 May 2020 09:08:03 +0300 Subject: add thumb/arm macros and change makefiles to reflect that. and decompilation of FUN_020910A4.c --- include/global.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index 33880ca1..ba6a7337 100644 --- a/include/global.h +++ b/include/global.h @@ -1,6 +1,7 @@ #ifndef GUARD_GLOBAL_H #define GUARD_GLOBAL_H +#include "function_target.h" #include "nitro/nitro.h" #endif //GUARD_GLOBAL_H -- cgit v1.2.3 From b950f6a92302af19769a76006a9a83c68b1a47c6 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 1 May 2020 03:06:54 -0400 Subject: migrate and match OS_alloc. Thanks Demki! --- include/nitro/os_system.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'include') diff --git a/include/nitro/os_system.h b/include/nitro/os_system.h index fc6a2f81..c7f121bd 100644 --- a/include/nitro/os_system.h +++ b/include/nitro/os_system.h @@ -18,18 +18,8 @@ typedef enum { } OSProcMode; typedef enum { - OS_INTRMODE_IRQ_DISABLE = HW_PSR_IRQ_DISABLE, - OS_INTRMODE_IRQ_ENABLE = 0 -} OSIntrMode_Irq; - -typedef enum { - OS_INTRMODE_FIQ_DISABLE = HW_PSR_FIQ_DISABLE, - OS_INTRMODE_FIQ_ENABLE = 0 -} OSIntrMode_Fiq; - -typedef union { - OSIntrMode_Fiq mode_fiq; - OSIntrMode_Irq mode_irq; + OS_INTRMODE_DISABLE = HW_PSR_IRQ_DISABLE, + OS_INTRMODE_ENABLE = 0 } OSIntrMode; OSIntrMode OS_EnableInterrupts(); @@ -37,7 +27,6 @@ OSIntrMode OS_DisableInterrupts(); OSIntrMode OS_RestoreInterrupts(OSIntrMode state); OSIntrMode OS_DisableInterrupts_IrqAndFiq(); OSIntrMode OS_RestoreInterrupts_IrqAndFiq(OSIntrMode state); -OSIntrMode_Irq OS_GetCpsrIrq(); OSProcMode OS_GetProcMode(); -- cgit v1.2.3