diff options
| author | iProgramInCpp <iprogramincpp@gmail.com> | 2021-10-16 14:18:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-16 15:18:38 -0600 |
| commit | 4c4efd28f89554ad43b3c37ae44f577003bccdb3 (patch) | |
| tree | cc8aa32eaa67ed6fc50a08a643d57d2bee6dddfa /src/os | |
| parent | 3129da2f1c49447b99b11a0661e1b842f6d1e66b (diff) | |
Match `func_80000D3C` (renamed) and `thread5_game_logic` (#35)
* match func_80000D3C + some renames
* Improved matching for init_game().
* Match thread5_game_logic
* Added osViModeTable and osCreateViManager from libultra
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/osCreateViManager.c | 4 | ||||
| -rw-r--r-- | src/os/osInitialize.c | 3 | ||||
| -rw-r--r-- | src/os/osViTable.c | 4 |
3 files changed, 2 insertions, 9 deletions
diff --git a/src/os/osCreateViManager.c b/src/os/osCreateViManager.c index e44f47777..a90b3eab5 100644 --- a/src/os/osCreateViManager.c +++ b/src/os/osCreateViManager.c @@ -1,4 +1,5 @@ #include "libultra_internal.h" +#include <macros.h> #define OS_VI_MANAGER_MESSAGE_BUFF_SIZE 5 @@ -15,7 +16,6 @@ extern void __osTimerServicesInit(void); extern void __osTimerInterrupt(void); extern OSTime __osCurrentTime; extern u32 __osBaseCounter; -extern u32 D_80365DA8; extern u32 __osViIntrCount; void viMgrMain(void *); @@ -47,9 +47,7 @@ void osCreateViManager(OSPri pri) { viMgrMainArgs.eventQueue = &__osViMesgQueue; viMgrMainArgs.accessQueue = NULL; viMgrMainArgs.dma_func = NULL; -#if defined(VERSION_EU) || defined(VERSION_SH) viMgrMainArgs.edma_func = NULL; -#endif osCreateThread(&viMgrThread, 0, viMgrMain, (void *) &viMgrMainArgs, &viMgrStack[0x400], pri); __osViInit(); diff --git a/src/os/osInitialize.c b/src/os/osInitialize.c index 3b51ee6c0..2974ff539 100644 --- a/src/os/osInitialize.c +++ b/src/os/osInitialize.c @@ -13,12 +13,11 @@ typedef struct { extern u32 D_80194040; // maybe initialized? extern s32 __osLeoInterrupt; -extern u32 D_800EA5F0; - u64 osClockRate = 62500000; u32 D_800EA5E8 = 0; u32 __OSGlobalIntMask = OS_IM_ALL; +u32 D_800EA5F0 = 0; #define EXCEPTION_TLB_MISS 0x80000000 #define EXCEPTION_XTLB_MISS 0x80000080 diff --git a/src/os/osViTable.c b/src/os/osViTable.c index 424f7ccac..fccb4b674 100644 --- a/src/os/osViTable.c +++ b/src/os/osViTable.c @@ -324,7 +324,6 @@ OSViMode osViModeTable[] = { /*vBurst*/ 918020, /*vIntr*/ 2 } } }, -#if defined(VERSION_JP) || defined(VERSION_EU) || defined(VERSION_SH) /*osViModePalLpn1*/ { /*type*/ 14, /*comRegs*/ @@ -773,8 +772,6 @@ OSViMode osViModeTable[] = { /*vStart*/ 6226489, /*vBurst*/ 852585, /*vIntr*/ 2 } } }, -#endif -#if defined(VERSION_US) || defined(VERSION_EU) || defined (VERSION_SH) /*osViModePalLpn1*/ { /*type*/ 28, /*comRegs*/ @@ -1097,5 +1094,4 @@ OSViMode osViModeTable[] = { /*vStart*/ 2425343, /*vBurst*/ 918020, /*vIntr*/ 2 } } } -#endif }; |