Get irqmgr matching

AgentBlade4 · Apr 29, 2023 · f678127 · f678127
1 parent d099c2d
commit f678127
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/config/rel_slices.yml b/config/rel_slices.yml
@@ -52,10 +52,10 @@ graph.c:
     .text: [0x80405518, 0x80405EC8]
     .data: [0x8065ECA8, 0x8065ECB0]
     .bss: [0x812F31E8, 0x812F3560]
-irqmgr.c:
-    .text: [0x80405EC8, 0x80406480]
-    .data: [0x8065ECB0, 0x8065ECD0]
-    .bss: [0x812F3560, 0x812F4CB0]
+#irqmgr.c:
+#    .text: [0x80405EC8, 0x80406480]
+#    .data: [0x8065ECB0, 0x8065ECD0]
+#    .bss: [0x812F3560, 0x812F4CB0]
 lb_rtc.c:
     .text: [0x80406480, 0x8040752C]
     .rodata: [0x806436F8, 0x806437A0]

diff --git a/include/libultra/os_timer.h b/include/libultra/os_timer.h
@@ -2,6 +2,7 @@
 #define LIBULTRA_OS_TIMER_H
 
 #include "types.h"
+#include "dolphin/os/OSTime.h"
 #include "dolphin/os/OSTimer.h"
 #include "dolphin/os/OSMessage.h"
 

diff --git a/rel/irqmgr.c b/rel/irqmgr.c
@@ -7,7 +7,7 @@
 #include "dolphin/os/OSMessage.h"
 #include "dolphin/os/OSTime.h"
 
-#define MSEC(x) OSMicrosecondsToTicks((x) * (OSTime)1000)
+#define MSEC(x) OSMicrosecondsToTicks(((u64)(x)) * (u64)1000)
 
 volatile int ResetStatus;             // 0x00
 volatile OSTime ResetTime;    // 0x08