gijs
/
ogrebattle64
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename `obStackMain` to `nuContNum`

This commit is contained in:
gijs 2023-10-20 19:53:24 +02:00
parent 84c9518b4c
commit 5ce4b39095
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linker_scripts/symbols/addr.txt
View File

@ -37,6 +37,7 @@ nuContDataMutexQ = 0x800E9BF0;
nuContDataMutexBuf = 0x800BE194; nuContDataMutexBuf = 0x800BE194;
nuContCallBack = 0x800A9FF8; nuContCallBack = 0x800A9FF8;
nuContStatus = 0x800C4B38; // size:0x10 type:u32 nuContStatus = 0x800C4B38; // size:0x10 type:u32
nuContNum = 0x800C6D60;
nuBoot = 0x8007F880; nuBoot = 0x8007F880;
nuScCreateScheduler = 0x80088C50; // rom:0x19050 nuScCreateScheduler = 0x80088C50; // rom:0x19050
@ -1012,7 +1013,6 @@ __virtual_mem_alloc = 0x80070F30;
obMain = 0x80071EB0; obMain = 0x80071EB0;
obThreadMain = 0x800AF5F0; obThreadMain = 0x800AF5F0;
obStackMain = 0x800C6D60;
entry = 0x80070C00; entry = 0x80070C00;

6
src/_ob_prized_reading.c
View File

@ -2,8 +2,6 @@
#include "nu/nusys.h" #include "nu/nusys.h"
extern u32 obStackMain;
/* 1A660 8008A260 */ /* 1A660 8008A260 */
u8 nuContMgrInit(void) { u8 nuContMgrInit(void) {
s32 var_a0; s32 var_a0;
@ -19,12 +17,12 @@ u8 nuContMgrInit(void) {
var_a0 = 1; var_a0 = 1;
var_a1 = 0; var_a1 = 0;
var_v1 = 0; var_v1 = 0;
obStackMain = 0; nuContNum = 0;
for(; var_v1 < MAXCONTROLLERS; var_v1++) { for(; var_v1 < MAXCONTROLLERS; var_v1++) {
if (nuContStatus[var_v1].errno == 0) { if (nuContStatus[var_v1].errno == 0) {
if ((nuContStatus[var_v1].type & CONT_TYPE_MASK) == CONT_TYPE_NORMAL) { if ((nuContStatus[var_v1].type & CONT_TYPE_MASK) == CONT_TYPE_NORMAL) {
var_a1 |= var_a0; var_a1 |= var_a0;
obStackMain += 1; nuContNum += 1;
} }
var_a0 *= 2; var_a0 *= 2;
} }

4
src/boot.c
View File

@ -5,8 +5,6 @@
extern OSThread nuThreadIdle; extern OSThread nuThreadIdle;
extern u64 nuStackIdle[]; extern u64 nuStackIdle[];
extern u8 obStackMain[];
void nuIdle(void* arg); void nuIdle(void* arg);
void nuBoot(void) { void nuBoot(void) {
@ -23,7 +21,7 @@ void nuIdle(void* arg) {
osViSetSpecialFeatures(OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF); osViSetSpecialFeatures(OS_VI_DIVOT_ON | OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF | OS_VI_GAMMA_DITHER_OFF);
osCreateThread(&obThreadMain, NU_MAIN_THREAD_ID, obMain, NULL, obStackMain, NU_MAIN_THREAD_PRI); osCreateThread(&obThreadMain, NU_MAIN_THREAD_ID, obMain, NULL, &nuContNum, NU_MAIN_THREAD_PRI);
osStartThread(&obThreadMain); osStartThread(&obThreadMain);
osSetThreadPri(&nuThreadIdle, NU_IDLE_THREAD_PRI); osSetThreadPri(&nuThreadIdle, NU_IDLE_THREAD_PRI);