diff options
| author | mzxrules <mzxrules@gmail.com> | 2022-07-22 21:15:35 -0400 |
|---|---|---|
| committer | mzxrules <mzxrules@gmail.com> | 2022-07-22 21:15:35 -0400 |
| commit | 4ae7b95206e9316586134cd1481a14e0870b6e16 (patch) | |
| tree | 1dcc784274986c554cddadabb7f363c631325af8 /src/boot_O2_g3 | |
| parent | bbdf16e7d4ec6fbf0626d1cc28fdd004c2c0e332 (diff) | |
| parent | addfe3a6133819e3b82e5e55a72b847f55757cc9 (diff) | |
Merge remote-tracking branch 'upstream/master' into z_map_
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/fault.c | 5 | ||||
| -rw-r--r-- | src/boot_O2_g3/idle.c | 1 | ||||
| -rw-r--r-- | src/boot_O2_g3/yaz0.c | 1 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/boot_O2_g3/fault.c b/src/boot_O2_g3/fault.c index 1f5503445..bc7e8d34a 100644 --- a/src/boot_O2_g3/fault.c +++ b/src/boot_O2_g3/fault.c @@ -29,7 +29,7 @@ const char* sFpuExceptions[] = { }; void Fault_SleepImpl(u32 duration) { - u64 value = (duration * OS_CPU_COUNTER) / 1000ull; + u64 value = (duration * OS_CPU_COUNTER) / 1000ULL; Sleep_Cycles(value); } @@ -702,8 +702,9 @@ void Fault_ResumeThread(OSThread* t) { osStartThread(t); } -void Fault_CommitFB() { +void Fault_CommitFB(void) { u16* fb; + osViSetYScale(1.0f); osViSetMode(&osViModeNtscLan1); osViSetSpecialFeatures(0x42); // gama_disable|dither_fliter_enable_aa_mode3_disable diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index da93f13fd..942435fa7 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -1,4 +1,3 @@ -#include "prevent_bss_reordering.h" #include "global.h" u8 D_80096B20 = 1; diff --git a/src/boot_O2_g3/yaz0.c b/src/boot_O2_g3/yaz0.c index 80d819acc..5f8e5a0ed 100644 --- a/src/boot_O2_g3/yaz0.c +++ b/src/boot_O2_g3/yaz0.c @@ -1,3 +1,4 @@ +#include "prevent_bss_reordering.h" #include "global.h" u8 sYaz0DataBuffer[0x400]; diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index d9c7fb221..10d84dcb0 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -1,3 +1,4 @@ +#include "prevent_bss_reordering.h" #include "global.h" u32 sDmaMgrDmaBuffSize = 0x2000; |