diff options
| author | fig02 <fig02srl@gmail.com> | 2025-04-19 22:04:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-19 22:04:08 -0400 |
| commit | 2278bcb2c3383553d136216a7fc1600cd86485f3 (patch) | |
| tree | 5aaf0522d10f2c0f0ec43653bb136ba603099b7a /src/boot | |
| parent | 655ec771387927eda89d89b5bc2751192b075909 (diff) | |
Remove Variables.h; Decouple z64.h from global.h (#2507)
* progress
* z64.h issues sorted
* remove variables.h
* format
* n64 fix
* another fix
* did the wrong fix
* fix libleo
* fix bss
* review
* remove instead of comment
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/driverominit.c | 2 | ||||
| -rw-r--r-- | src/boot/idle.c | 5 | ||||
| -rw-r--r-- | src/boot/is_debug.c | 2 | ||||
| -rw-r--r-- | src/boot/yaz0.c | 6 | ||||
| -rw-r--r-- | src/boot/z_std_dma.c | 5 |
5 files changed, 13 insertions, 7 deletions
diff --git a/src/boot/driverominit.c b/src/boot/driverominit.c index 5ed69abe0..72ab069d3 100644 --- a/src/boot/driverominit.c +++ b/src/boot/driverominit.c @@ -1,4 +1,4 @@ -#include "global.h" +#include "ultra64.h" OSPiHandle __DriveRomHandle; diff --git a/src/boot/idle.c b/src/boot/idle.c index 190130c02..eaae7e1b9 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -9,11 +9,12 @@ #include "versions.h" #include "vi_mode.h" #include "z64thread.h" +#include "z64dma.h" #include "global.h" -#pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ - "ntsc-1.0:138 ntsc-1.1:138 ntsc-1.2:138 pal-1.0:136 pal-1.1:136" +#pragma increment_block_number "gc-eu:192 gc-eu-mq:192 gc-jp:192 gc-jp-ce:192 gc-jp-mq:192 gc-us:192 gc-us-mq:192" \ + "ntsc-1.0:192 ntsc-1.1:192 ntsc-1.2:192 pal-1.0:192 pal-1.1:192" OSThread sMainThread; #if OOT_VERSION < PAL_1_0 diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index d520b262b..6d6311885 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -1,6 +1,6 @@ #include "is_debug.h" -#include "global.h" +#include "ultra64.h" typedef struct ISVDbg { /* 0x00 */ u32 magic; // "IS64" diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 2d6a4ec7c..eb3ce2331 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -1,4 +1,8 @@ -#include "global.h" +#include "yaz0.h" + +#include "alignment.h" +#include "ultra64.h" +#include "z64dma.h" #pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:128" \ "pal-1.1:128" diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 2e742ec92..db9559dcd 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -39,12 +39,13 @@ #if !PLATFORM_IQUE #include "yaz0.h" #endif +#include "z64dma.h" #include "z64thread.h" #include "global.h" -#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:36" \ - "pal-1.0:34 pal-1.1:34" +#pragma increment_block_number "gc-eu:0 gc-eu-mq:0 gc-jp:0 gc-jp-ce:0 gc-jp-mq:0 gc-us:0 gc-us-mq:0 ntsc-1.2:66" \ + "pal-1.0:64 pal-1.1:64" StackEntry sDmaMgrStackInfo; OSMesgQueue sDmaMgrMsgQueue; |