diff --git a/include/common.h b/include/common.h index 91f0898..0fceec8 100644 --- a/include/common.h +++ b/include/common.h @@ -137,7 +137,6 @@ extern OSPiHandle* CART_HANDLE; extern OSMesgQueue MQ_800E7988; extern s32 D_800C4B30; -extern OSMesgQueue MQ_800E9BF0; extern u8 D_800A9FF8; extern OSContStatus __GLOBAL_CONT_STATUS[MAXCONTROLLERS]; diff --git a/include/nu/nusys.h b/include/nu/nusys.h index 4522c9c..95cbab5 100644 --- a/include/nu/nusys.h +++ b/include/nu/nusys.h @@ -688,6 +688,7 @@ extern u32 nuContNum; /* Number of controllers connected */ extern u32 nuContDataLockKey; /* Lock Controller data. */ extern OSMesgQueue nuContWaitMesgQ; /* Wait for Controller read */ extern OSMesg nuContWaitMesgBuf; +extern OSMesgQueue nuContDataMutexQ; extern OSPfs nuContPfs[]; extern NUCallBackList nuContCallBack; extern u16 nuContPakCompanyCode; /* Company code */ diff --git a/linker_scripts/symbols/addr.txt b/linker_scripts/symbols/addr.txt index 64c035b..2acecba 100644 --- a/linker_scripts/symbols/addr.txt +++ b/linker_scripts/symbols/addr.txt @@ -33,6 +33,7 @@ nuPiMgrMesgQ = 0x800BE030; nuPiMesgBuf = 0x800BE048; nuContWaitMesgQ = 0x800C4A00; nuContWaitMesgBuf = 0x800BE190; +nuContDataMutexQ = 0x800E9BF0; nuBoot = 0x8007F880; nuScCreateScheduler = 0x80088C50; // rom:0x19050 @@ -917,7 +918,6 @@ __MUS_MEM_800B1868 = 0x800B1868; MQ_SWAP_BUFFER = 0x800E9BA8; MQ_800E7988 = 0x800E7988; -MQ_800E9BF0 = 0x800E9BF0; MQ_800C35A0 = 0x800C35A0; MQ_800AF320 = 0x800AF320; MQ_800B1880 = 0x800B1880; diff --git a/src/_ob_prized_reading.c b/src/_ob_prized_reading.c index 83925d4..95431e0 100644 --- a/src/_ob_prized_reading.c +++ b/src/_ob_prized_reading.c @@ -14,7 +14,7 @@ u8 nuContMgrInit(void) { nuContDataUnLock(); osCreateMesgQueue(&nuContWaitMesgQ, &nuContWaitMesgBuf, 1); - osCreateMesgQueue(&MQ_800E9BF0, &OSMESG_800BE194, 1); + osCreateMesgQueue(&nuContDataMutexQ, &OSMESG_800BE194, 1); nuSiCallBackAdd(&D_800A9FF8); nuContQueryRead(); @@ -42,11 +42,11 @@ void func_8008A334(void) { } void __start_copy_global_controller_data(void) { - osSendMesg(&MQ_800E9BF0, NULL, OS_MESG_BLOCK); + osSendMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); } void __end_copy_global_controller_data(void) { - osRecvMesg(&MQ_800E9BF0, NULL, OS_MESG_BLOCK); + osRecvMesg(&nuContDataMutexQ, NULL, OS_MESG_BLOCK); } s32 __read_controller(OSContPad* data, u32 flags) {