diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-08-01 06:58:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-01 09:58:04 -0400 |
| commit | 92ac058f3d8dd7156c57c388f59d9c36130273f8 (patch) | |
| tree | fb23b82cbe466843bfd373405fd28d7f95c362b1 /include | |
| parent | d32c85b00b432ed094143f9e06145a61a707d2dc (diff) | |
Idle OK (#26)
* Matched
* Fix yaml and format
* Fix yaml pt 2
Diffstat (limited to 'include')
| -rw-r--r-- | include/idle.h | 4 | ||||
| -rw-r--r-- | include/m_thread.h | 2 | ||||
| -rw-r--r-- | include/main.h | 2 | ||||
| -rw-r--r-- | include/segment_symbols.h | 19 | ||||
| -rw-r--r-- | include/z_std_dma.h | 7 |
5 files changed, 19 insertions, 15 deletions
diff --git a/include/idle.h b/include/idle.h index 02d9875..f210ec3 100644 --- a/include/idle.h +++ b/include/idle.h @@ -3,8 +3,8 @@ #include "ultra64.h" -// void func_80025DF0_jp(); -// void func_80025E6C_jp(); +extern OSViMode gViConfigMode; + void Idle_ThreadEntry(void* arg); #endif diff --git a/include/m_thread.h b/include/m_thread.h index 7c89f41..792c610 100644 --- a/include/m_thread.h +++ b/include/m_thread.h @@ -2,7 +2,9 @@ #define M_THREAD_H #define M_THREAD_ID_IDLE 1 +#define M_THREAD_ID_MAIN 3 #define M_PRIORITY_IDLE 12 +#define M_PRIORITY_MAIN 12 #endif diff --git a/include/main.h b/include/main.h index f3e4866..a93c3f2 100644 --- a/include/main.h +++ b/include/main.h @@ -4,6 +4,6 @@ #include "ultra64.h" // void func_800D64E0_jp(); -// void func_800D66D0_jp(); +void func_800D66D0_jp(void* arg0); #endif diff --git a/include/segment_symbols.h b/include/segment_symbols.h index e9e7c32..79ee86e 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -7,21 +7,21 @@ #define DECLARE_VRAM_SEGMENT(name) \ - extern u32 name ## _VRAM[]; \ - extern u32 name ## _VRAM_END[] + extern u8 name ## _VRAM[]; \ + extern u8 name ## _VRAM_END[] #define DECLARE_ROM_SEGMENT(name) \ - extern u32 name ## _ROM_START[]; \ - extern u32 name ## _ROM_END[] + extern u8 name ## _ROM_START[]; \ + extern u8 name ## _ROM_END[] #define DECLARE_DATA_SEGMENT(name) \ - extern u32 name ## _DATA_START[]; \ - extern u32 name ## _DATA_END[]; \ - extern u32 name ## _DATA_SIZE[] + extern u8 name ## _DATA_START[]; \ + extern u8 name ## _DATA_END[]; \ + extern u8 name ## _DATA_SIZE[] #define DECLARE_BSS_SEGMENT(name) \ - extern u32 name ## _BSS_START[]; \ - extern u32 name ## _BSS_END[] + extern u8 name ## _BSS_START[]; \ + extern u8 name ## _BSS_END[] #define DECLARE_SEGMENT(name) \ DECLARE_VRAM_SEGMENT(name); \ @@ -36,6 +36,7 @@ #define SEGMENT_ROM_START(segment) ((RomOffset)segment ## _ROM_START) #define SEGMENT_ROM_END(segment) ((RomOffset)segment ## _ROM_END) #define SEGMENT_ROM_SIZE(segment) (SEGMENT_ROM_END(segment) - SEGMENT_ROM_START(segment)) +#define SEGMENT_ROM_SIZE_ALT(segment) ((size_t)(segment ## _ROM_END - segment ## _ROM_START)) #define SEGMENT_DATA_SIZE_CONST(segment) ((RomOffset)segment ## _DATA_SIZE) diff --git a/include/z_std_dma.h b/include/z_std_dma.h index 7096e50..3945e21 100644 --- a/include/z_std_dma.h +++ b/include/z_std_dma.h @@ -1,6 +1,7 @@ #ifndef Z_STD_DMA_H #define Z_STD_DMA_H +#include "libc/stdint.h" #include "ultra64.h" #include "other_types.h" @@ -28,9 +29,9 @@ void DmaMgr_RequestSync(void* ram, void* vrom, size_t size); // void func_80026C00_jp(); // void func_80026C28_jp(); // void func_80026C4C_jp(); -// void func_80026CAC_jp(); -// void func_80026DA0_jp(); +void func_80026CAC_jp(void); +void func_80026DA0_jp(void); // void func_80026DCC_jp(); -// void func_80026E10_jp(); +void func_80026E10_jp(void* arg0, RomOffset arg1, size_t arg2, const char* arg3, s32 arg4); #endif |
