summaryrefslogtreecommitdiff
path: root/arm9
diff options
context:
space:
mode:
Diffstat (limited to 'arm9')
-rw-r--r--arm9/asm/OS_irqTable.s163
-rw-r--r--arm9/lib/include/OS_init.h1
-rw-r--r--arm9/lib/include/OS_interrupt.h9
-rw-r--r--arm9/lib/include/OS_irqTable.h23
-rw-r--r--arm9/lib/include/OS_reset.h15
-rw-r--r--arm9/lib/include/PXI_fifo.h35
-rw-r--r--arm9/lib/include/mmap.h1
-rw-r--r--arm9/lib/src/OS_irqTable.c110
-rw-r--r--arm9/lib/src/OS_reset.c4
9 files changed, 146 insertions, 215 deletions
diff --git a/arm9/asm/OS_irqTable.s b/arm9/asm/OS_irqTable.s
deleted file mode 100644
index e42d600b..00000000
--- a/arm9/asm/OS_irqTable.s
+++ /dev/null
@@ -1,163 +0,0 @@
- .include "asm/macros.inc"
- .include "global.inc"
-
- ; pragma section DTCM begin
- .section .dtcm
- .balign 16, 0
- .global OS_IRQTable
-OS_IRQTable: ; 027E0000 ;10b6a0
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OSi_IrqTimer0
- .word OSi_IrqTimer1
- .word OSi_IrqTimer2
- .word OSi_IrqTimer3
- .word OS_IrqDummy
- .word OSi_IrqDma0
- .word OSi_IrqDma1
- .word OSi_IrqDma2
- .word OSi_IrqDma3
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
- .word OS_IrqDummy
-
- ; pragma section DTCM end
-
- .section .bss
- .global OSi_IrqCallbackInfo
-OSi_IrqCallbackInfo: ; 0x021D341C
- .space 0x60
-
- .section .data
- .global OSi_IrqCallbackInfoIndex
-OSi_IrqCallbackInfoIndex: ; 0x02106818
- .short 8
- .short 9
- .short 10
- .short 11
- .short 3
- .short 4
- .short 5
- .short 6
-
- .section .text
-
- arm_func_start OSi_IrqTimer3
-OSi_IrqTimer3: ; 0x020C9C8C
- ldr ip, _020C9C98 ; =OSi_IrqCallback
- mov r0, #0x7
- bx r12
- .balign 4
-_020C9C98: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqTimer2
-OSi_IrqTimer2: ; 0x020C9C9C
- ldr ip, _020C9CA8 ; =OSi_IrqCallback
- mov r0, #0x6
- bx r12
- .balign 4
-_020C9CA8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqTimer1
-OSi_IrqTimer1: ; 0x020C9CAC
- ldr ip, _020C9CB8 ; =OSi_IrqCallback
- mov r0, #0x5
- bx r12
- .balign 4
-_020C9CB8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqTimer0
-OSi_IrqTimer0: ; 0x020C9CBC
- ldr ip, _020C9CC8 ; =OSi_IrqCallback
- mov r0, #0x4
- bx r12
- .balign 4
-_020C9CC8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqDma3
-OSi_IrqDma3: ; 0x020C9CCC
- ldr ip, _020C9CD8 ; =OSi_IrqCallback
- mov r0, #0x3
- bx r12
- .balign 4
-_020C9CD8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqDma2
-OSi_IrqDma2: ; 0x020C9CDC
- ldr ip, _020C9CE8 ; =OSi_IrqCallback
- mov r0, #0x2
- bx r12
- .balign 4
-_020C9CE8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqDma1
-OSi_IrqDma1: ; 0x020C9CEC
- ldr ip, _020C9CF8 ; =OSi_IrqCallback
- mov r0, #0x1
- bx r12
- .balign 4
-_020C9CF8: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqDma0
-OSi_IrqDma0: ; 0x020C9CFC
- ldr ip, _020C9D08 ; =OSi_IrqCallback
- mov r0, #0x0
- bx r12
- .balign 4
-_020C9D08: .word OSi_IrqCallback
-
- arm_func_start OSi_IrqCallback
-OSi_IrqCallback: ; 0x020C9D0C
- stmdb sp!, {r4-r5,lr}
- sub sp, sp, #0x4
- mov r1, #0xc
- mul r4, r0, r1
- ldr r2, _020C9D94 ; =OSi_IrqCallbackInfo
- ldr r3, _020C9D98 ; =OSi_IrqCallbackInfoIndex
- mov r0, r0, lsl #0x1
- ldr r1, [r2, r4]
- ldrh r3, [r3, r0]
- mov r5, #0x1
- mov r0, #0x0
- str r0, [r2, r4]
- cmp r1, #0x0
- mov r5, r5, lsl r3
- beq _020C9D54
- ldr r0, _020C9D9C ; =OSi_IrqCallbackInfo + 8
- ldr r0, [r0, r4]
- blx r1
-_020C9D54:
- ldr r0, _020C9DA0 ; =SDK_AUTOLOAD_DTCM_START
- ldr r1, _020C9DA4 ; =OSi_IrqCallbackInfo + 4
- add r0, r0, #0x3000
- ldr r2, [r0, #0xff8]
- orr r2, r2, r5
- str r2, [r0, #0xff8]
- ldr r0, [r1, r4]
- cmp r0, #0x0
- addne sp, sp, #0x4
- ldmneia sp!, {r4-r5,lr}
- bxne lr
- mov r0, r5
- bl OS_DisableIrqMask
- add sp, sp, #0x4
- ldmia sp!, {r4-r5,lr}
- bx lr
- .balign 4
-_020C9D94: .word OSi_IrqCallbackInfo
-_020C9D98: .word OSi_IrqCallbackInfoIndex
-_020C9D9C: .word OSi_IrqCallbackInfo + 8
-_020C9DA0: .word SDK_AUTOLOAD_DTCM_START
-_020C9DA4: .word OSi_IrqCallbackInfo + 4
-
- arm_func_start OS_IrqDummy
-OS_IrqDummy: ; 0x020C9DA8
- bx lr
diff --git a/arm9/lib/include/OS_init.h b/arm9/lib/include/OS_init.h
index baa2f442..3c8aea24 100644
--- a/arm9/lib/include/OS_init.h
+++ b/arm9/lib/include/OS_init.h
@@ -19,6 +19,7 @@
#include "OS_system.h"
#include "OS_terminate_proc.h"
#include "OS_irqHandler.h"
+#include "OS_irqTable.h"
#include "OS_interrupt.h"
#include "OS_reset.h"
#include "OS_spinLock.h"
diff --git a/arm9/lib/include/OS_interrupt.h b/arm9/lib/include/OS_interrupt.h
index 6ffa3a10..ec58a636 100644
--- a/arm9/lib/include/OS_interrupt.h
+++ b/arm9/lib/include/OS_interrupt.h
@@ -1,7 +1,8 @@
-#ifndef POKEDIAMOND_OS_INTERRUPT_H
-#define POKEDIAMOND_OS_INTERRUPT_H
+#ifndef POKEDIAMOND_ARM9_OS_INTERRUPT_H
+#define POKEDIAMOND_ARM9_OS_INTERRUPT_H
#include "nitro/types.h"
+#include "nitro/OS_interrupt_shared.h"
typedef void (*OSIrqFunction) (void);
@@ -12,8 +13,6 @@ typedef struct
void* arg;
} OSIrqCallbackInfo;
-typedef u32 OSIrqMask;
-
extern OSIrqFunction OS_IRQTable[];
extern OSIrqCallbackInfo OSi_IrqCallbackInfo[8];
@@ -28,4 +27,4 @@ OSIrqMask OS_DisableIrqMask(OSIrqMask mask);
OSIrqMask OS_ResetRequestIrqMask(OSIrqMask mask);
void OS_SetIrqStackChecker(void);
-#endif //POKEDIAMOND_OS_INTERRUPT_H
+#endif //POKEDIAMOND_ARM9_OS_INTERRUPT_H
diff --git a/arm9/lib/include/OS_irqTable.h b/arm9/lib/include/OS_irqTable.h
new file mode 100644
index 00000000..8cd7b7b3
--- /dev/null
+++ b/arm9/lib/include/OS_irqTable.h
@@ -0,0 +1,23 @@
+#ifndef POKEDIAMOND_OS_IRQTABLE_H
+#define POKEDIAMOND_OS_IRQTABLE_H
+
+#include "consts.h"
+#include "OS_interrupt.h"
+
+void OS_IrqDummy(void);
+void OSi_IrqCallback(s32 index);
+void OSi_IrqDma0(void);
+void OSi_IrqDma1(void);
+void OSi_IrqDma2(void);
+void OSi_IrqDma3(void);
+void OSi_IrqTimer0(void);
+void OSi_IrqTimer1(void);
+void OSi_IrqTimer2(void);
+void OSi_IrqTimer3(void);
+
+static inline void OS_SetIrqCheckFlag(OSIrqMask intr)
+{
+ *(vu32 *)HW_INTR_CHECK_BUF |= (u32)intr;
+}
+
+#endif //POKEDIAMOND_OS_IRQTABLE_H
diff --git a/arm9/lib/include/OS_reset.h b/arm9/lib/include/OS_reset.h
index cb7680d1..ef62184b 100644
--- a/arm9/lib/include/OS_reset.h
+++ b/arm9/lib/include/OS_reset.h
@@ -1,17 +1,10 @@
-//
-// Created by red031000 on 2020-05-06.
-//
-
-#ifndef POKEDIAMOND_OS_RESET_H
-#define POKEDIAMOND_OS_RESET_H
+#ifndef POKEDIAMOND_ARM9_OS_RESET_H
+#define POKEDIAMOND_ARM9_OS_RESET_H
#include "consts.h"
+#include "nitro/OS_reset_shared.h"
#include "PXI_fifo.h"
-#define OS_PXI_COMMAND_MASK 0x7f00
-#define OS_PXI_COMMAND_SHIFT 8
-#define OS_PXI_COMMAND_RESET 0x10
-
void OS_InitReset(void);
static void OSi_CommonCallback(PXIFifoTag tag, u32 data, BOOL err);
static void OSi_SendToPxi(u16 data);
@@ -27,4 +20,4 @@ static inline u32 OS_GetResetParameter(void)
return (u32)*(u32 *)HW_RESET_PARAMETER_BUF;
}
-#endif //POKEDIAMOND_OS_RESET_H
+#endif //POKEDIAMOND_ARM9_OS_RESET_H
diff --git a/arm9/lib/include/PXI_fifo.h b/arm9/lib/include/PXI_fifo.h
index 1d45dda2..45caa906 100644
--- a/arm9/lib/include/PXI_fifo.h
+++ b/arm9/lib/include/PXI_fifo.h
@@ -1,33 +1,6 @@
-//
-// Created by red031000 on 2020-05-06.
-//
+#ifndef POKEDIAMOND_ARM9_PXI_FIFO_H
+#define POKEDIAMOND_ARM9_PXI_FIFO_H
-#ifndef POKEDIAMOND_PXI_FIFO_H
-#define POKEDIAMOND_PXI_FIFO_H
+#include "nitro/PXI_fifo_shared.h"
-#include "function_target.h"
-
-ENUMS_ALWAYS_INT_ON
-typedef enum {
- PXI_FIFO_TAG_EX = 0, // Extension format
- PXI_FIFO_TAG_USER_0, // for application programmer, use it in free
- PXI_FIFO_TAG_USER_1, // for application programmer, use it in free
- PXI_FIFO_TAG_SYSTEM, // SDK inner usage
- PXI_FIFO_TAG_NVRAM, // NVRAM
- PXI_FIFO_TAG_RTC, // RTC
- PXI_FIFO_TAG_TOUCHPANEL, // Touch Panel
- PXI_FIFO_TAG_SOUND, // Sound
- PXI_FIFO_TAG_PM, // Power Management
- PXI_FIFO_TAG_MIC, // Microphone
- PXI_FIFO_TAG_WM, // Wireless Manager
- PXI_FIFO_TAG_FS, // File System
- PXI_FIFO_TAG_OS, // OS
- PXI_FIFO_TAG_CTRDG, // Cartridge
- PXI_FIFO_TAG_CARD, // Card
- PXI_FIFO_TAG_WVR, // Control driving wireless library
- PXI_FIFO_TAG_CTRDG_Ex, // Cartridge Ex
- PXI_MAX_FIFO_TAG = 32 // MAX FIFO TAG
-} PXIFifoTag;
-ENUMS_ALWAYS_INT_RESET
-
-#endif //POKEDIAMOND_PXI_FIFO_H
+#endif //POKEDIAMOND_ARM9_PXI_FIFO_H
diff --git a/arm9/lib/include/mmap.h b/arm9/lib/include/mmap.h
index d0e73aec..6a5f23c5 100644
--- a/arm9/lib/include/mmap.h
+++ b/arm9/lib/include/mmap.h
@@ -27,7 +27,6 @@ extern u32 SDK_AUTOLOAD_DTCM_START[];
#define HW_RESET_PARAMETER_BUF (HW_MAIN_MEM + 0x007ffc20)
#define HW_ROM_BASE_OFFSET_BUF (HW_MAIN_MEM + 0x007ffc2c)
-#define HW_WM_BOOT_BUF (HW_MAIN_MEM + 0x007ffc40)
#define HW_ROM_HEADER_BUF (HW_MAIN_MEM + 0x007ffe00) // ROM registration area data buffer
#define HW_RED_RESERVED (HW_MAIN_MEM + 0x007ff800) // Some kind of reserved data for shared memory
#define HW_MAIN_MEM_SYSTEM (HW_MAIN_MEM + 0x007ffc00)
diff --git a/arm9/lib/src/OS_irqTable.c b/arm9/lib/src/OS_irqTable.c
new file mode 100644
index 00000000..cc2a3a55
--- /dev/null
+++ b/arm9/lib/src/OS_irqTable.c
@@ -0,0 +1,110 @@
+#include "function_target.h"
+#include "sections.h"
+#include "OS_irqTable.h"
+
+#pragma section DTCM begin
+OSIrqFunction OS_IRQTable[22] = {
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OSi_IrqTimer0,
+ OSi_IrqTimer1,
+ OSi_IrqTimer2,
+ OSi_IrqTimer3,
+ OS_IrqDummy,
+ OSi_IrqDma0,
+ OSi_IrqDma1,
+ OSi_IrqDma2,
+ OSi_IrqDma3,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy,
+ OS_IrqDummy
+};
+#pragma section DTCM end
+
+OSIrqCallbackInfo OSi_IrqCallbackInfo[8] = {
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+ {NULL, 0, 0},
+};
+
+static u16 OSi_IrqCallbackInfoIndex[8] = {
+ 8, 9, 10, 11, 3, 4, 5, 6
+};
+
+ARM_FUNC void OS_IrqDummy(void)
+{
+ //noop
+}
+
+ARM_FUNC void OSi_IrqCallback(s32 index)
+{
+ OSIrqMask mask = (1UL << OSi_IrqCallbackInfoIndex[index]);
+ void (*callback)(void *) = OSi_IrqCallbackInfo[index].func;
+
+ OSi_IrqCallbackInfo[index].func = NULL;
+
+ if (callback)
+ {
+ (callback)(OSi_IrqCallbackInfo[index].arg);
+ }
+
+ OS_SetIrqCheckFlag(mask);
+
+ if (!OSi_IrqCallbackInfo[index].enable)
+ {
+ (void)OS_DisableIrqMask(mask);
+ }
+}
+
+ARM_FUNC void OSi_IrqDma0(void)
+{
+ OSi_IrqCallback(0);
+}
+
+ARM_FUNC void OSi_IrqDma1(void)
+{
+ OSi_IrqCallback(1);
+}
+
+ARM_FUNC void OSi_IrqDma2(void)
+{
+ OSi_IrqCallback(2);
+}
+
+ARM_FUNC void OSi_IrqDma3(void)
+{
+ OSi_IrqCallback(3);
+}
+
+ARM_FUNC void OSi_IrqTimer0(void)
+{
+ OSi_IrqCallback(4);
+}
+
+ARM_FUNC void OSi_IrqTimer1(void)
+{
+ OSi_IrqCallback(5);
+}
+
+ARM_FUNC void OSi_IrqTimer2(void)
+{
+ OSi_IrqCallback(6);
+}
+
+ARM_FUNC void OSi_IrqTimer3(void)
+{
+ OSi_IrqCallback(7);
+}
diff --git a/arm9/lib/src/OS_reset.c b/arm9/lib/src/OS_reset.c
index 0857bf0b..f22b0e3c 100644
--- a/arm9/lib/src/OS_reset.c
+++ b/arm9/lib/src/OS_reset.c
@@ -1,7 +1,3 @@
-//
-// Created by red031000 on 2020-05-06.
-//
-
#include "function_target.h"
#include "OS_reset.h"
#include "MB_mb.h"
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 01:53:55 +0000