kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

labeling pfsManager functions

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-08 17:17:59 -06:00
parent 143182f44a
commit bbe9f8d384
30 changed files with 281 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core1/code_0.c
View File

@@ -110,9 +110,9 @@ void func_8023DC0C(void){
func_8025AFB0();
func_8033EF58();
assetCache_init();
func_8024F05C();
pfsManager_init();
func_80250C84();
func_8023FB1C();
audioManager_init();
func_8025425C();
func_80257424();
gctransition_reset();

166
src/core1/code_10A00.c
View File

@@ -42,21 +42,21 @@ s32 D_80275D38 = 0;
/* .bss */
UNK_TYPE(s32) D_802810E0[4][5];
u8 D_80281130;
u8 pfsManagerBitPattern;
Struct_core1_10A00_0 D_80281138[4];
Struct_core1_10A00_0 D_80281218;
Struct_core1_10A00_1 D_80281250[4];
OSMesg D_802812B0;
OSMesg D_802812B4;
OSContPad D_802812B8[4];
OSMesg pfsManagerContPollingMsqBuf;
OSMesg pfsManagerContReplyMsgBuf;
OSContPad pfsManagerContPadData[4];
OSContPad D_802812D0;
OSMesgQueue D_802812D8;
OSMesgQueue D_802812F0;
OSMesgQueue pfsManagerContPollingMsqQ;
OSMesgQueue pfsManagerContReplyMsgQ;
f32 D_80281308[4];
OSContStatus D_80281318;
OSContStatus pfsManagerContStatus;
u8 pad_D_80281320[0x8];
volatile s32 D_80281328;
OSThread D_80281330;
volatile s32 pfsManagerBusy;
OSThread pfsManagerThread;
u8 D_802814E0[0x200];
f32 D_802816E0;
OSMesgQueue D_802816E8;
@@ -152,8 +152,8 @@ void func_8024E71C(s32 controller_index, f32 dst[2]){
dst[1] = D_80281250[controller_index].joystick[1];
}
else{
dst[0] = func_8024E420(D_802812B8[controller_index].stick_x, 7, 0x3B);
dst[1] = func_8024E420(D_802812B8[controller_index].stick_y, 7, 0x3D);
dst[0] = func_8024E420(pfsManagerContPadData[controller_index].stick_x, 7, 0x3B);
dst[1] = func_8024E420(pfsManagerContPadData[controller_index].stick_y, 7, 0x3D);
}
}
@@ -173,9 +173,9 @@ void func_8024E7C8(void){
func_802E4384();
osSetThreadPri(NULL, 0x29);
D_802812D0.stick_x = D_802812B8[0].stick_x;
D_802812D0.stick_y = D_802812B8[0].stick_y;
D_802812D0.button = D_802812B8[0].button;
D_802812D0.stick_x = pfsManagerContPadData[0].stick_x;
D_802812D0.stick_y = pfsManagerContPadData[0].stick_y;
D_802812D0.button = pfsManagerContPadData[0].button;
if( getGameMode() == GAME_MODE_6_FILE_PLAYBACK
|| getGameMode() == GAME_MODE_7_ATTRACT_DEMO
|| getGameMode() == GAME_MODE_8_BOTTLES_BONUS
@@ -189,7 +189,7 @@ void func_8024E7C8(void){
if(D_802816E0 < 1.0 || getGameMode() == GAME_MODE_9_BANJO_AND_KAZOOIE){
s0 = 0;
}
temp_t6 = demo_readInput(&D_802812B8, &sp5C) == 0;
temp_t6 = demo_readInput(&pfsManagerContPadData, &sp5C) == 0;
if(D_802812D0.button & s0 || temp_t6){
if(D_802812D0.button & s0){
func_803204E4(0x64, 1);
@@ -206,15 +206,15 @@ void func_8024E7C8(void){
randf();
// var_s0_2 = &D_80281250;
// var_s1 = &D_802812B8
// var_s1 = &pfsManagerContPadData
for(i = 0; i < 4; i++){
// temp_t5 = var_s1->unk0;
// temp_t1 = temp_t5 & 0x20;
if ((D_802812B8[i].button & 0x20) && (D_802812B8[i].button & 0x10)) {
D_802810E0[i][0] = (D_802812B8[i].button & 0x0004) ? D_802810E0[i][0] + 1 : 0;
D_802810E0[i][1] = (D_802812B8[i].button & 0x2000) ? D_802810E0[i][1] + 1 : 0;
D_802810E0[i][2] = (D_802812B8[i].button & 0x8000) ? D_802810E0[i][2] + 1 : 0;
D_802810E0[i][3] = (D_802812B8[i].button & 0x4000) ? D_802810E0[i][3] + 1 : 0;
if ((pfsManagerContPadData[i].button & 0x20) && (pfsManagerContPadData[i].button & 0x10)) {
D_802810E0[i][0] = (pfsManagerContPadData[i].button & 0x0004) ? D_802810E0[i][0] + 1 : 0;
D_802810E0[i][1] = (pfsManagerContPadData[i].button & 0x2000) ? D_802810E0[i][1] + 1 : 0;
D_802810E0[i][2] = (pfsManagerContPadData[i].button & 0x8000) ? D_802810E0[i][2] + 1 : 0;
D_802810E0[i][3] = (pfsManagerContPadData[i].button & 0x4000) ? D_802810E0[i][3] + 1 : 0;
D_802810E0[i][4] = (D_802812D0.button & 0x4000) ? D_802810E0[i][4] + 1 : 0;
for(j = 0; j < 0xE; j++){
((s32*)&D_80281138[i])[j] = 0;
@@ -239,22 +239,22 @@ void func_8024E7C8(void){
D_802810E0[i][j] = 0;
}
D_80281138[i].face_button[0] = (D_802812B8[i].button & 0x8000) ? D_80281138[i].face_button[0] + 1 : 0;
D_80281138[i].face_button[1] = (D_802812B8[i].button & 0x4000) ? D_80281138[i].face_button[1] + 1 : 0;
D_80281138[i].face_button[2] = (D_802812B8[i].button & 0x0002) ? D_80281138[i].face_button[2] + 1 : 0;
D_80281138[i].face_button[3] = (D_802812B8[i].button & 0x0004) ? D_80281138[i].face_button[3] + 1 : 0;
D_80281138[i].face_button[4] = (D_802812B8[i].button & 0x0008) ? D_80281138[i].face_button[4] + 1 : 0;
D_80281138[i].face_button[5] = (D_802812B8[i].button & 0x0001) ? D_80281138[i].face_button[5] + 1 : 0;
D_80281138[i].face_button[0] = (pfsManagerContPadData[i].button & 0x8000) ? D_80281138[i].face_button[0] + 1 : 0;
D_80281138[i].face_button[1] = (pfsManagerContPadData[i].button & 0x4000) ? D_80281138[i].face_button[1] + 1 : 0;
D_80281138[i].face_button[2] = (pfsManagerContPadData[i].button & 0x0002) ? D_80281138[i].face_button[2] + 1 : 0;
D_80281138[i].face_button[3] = (pfsManagerContPadData[i].button & 0x0004) ? D_80281138[i].face_button[3] + 1 : 0;
D_80281138[i].face_button[4] = (pfsManagerContPadData[i].button & 0x0008) ? D_80281138[i].face_button[4] + 1 : 0;
D_80281138[i].face_button[5] = (pfsManagerContPadData[i].button & 0x0001) ? D_80281138[i].face_button[5] + 1 : 0;
D_80281138[i].side_button[0] = (D_802812B8[i].button & 0x2000) ? D_80281138[i].side_button[0] + 1 : 0;
D_80281138[i].side_button[1] = (D_802812B8[i].button & 0x0020) ? D_80281138[i].side_button[1] + 1 : 0;
D_80281138[i].side_button[2] = (D_802812B8[i].button & 0x0010) ? D_80281138[i].side_button[2] + 1 : 0;
D_80281138[i].side_button[0] = (pfsManagerContPadData[i].button & 0x2000) ? D_80281138[i].side_button[0] + 1 : 0;
D_80281138[i].side_button[1] = (pfsManagerContPadData[i].button & 0x0020) ? D_80281138[i].side_button[1] + 1 : 0;
D_80281138[i].side_button[2] = (pfsManagerContPadData[i].button & 0x0010) ? D_80281138[i].side_button[2] + 1 : 0;
D_80281138[i].unk24[0] = (D_802812B8[i].button & 0x0800) ? D_80281138[i].unk24[0] + 1 : 0;
D_80281138[i].unk24[1] = (D_802812B8[i].button & 0x0400) ? D_80281138[i].unk24[1] + 1 : 0;
D_80281138[i].unk24[2] = (D_802812B8[i].button & 0x0200) ? D_80281138[i].unk24[2] + 1 : 0;
D_80281138[i].unk24[3] = (D_802812B8[i].button & 0x0100) ? D_80281138[i].unk24[3] + 1 : 0;
D_80281138[i].start_button = (D_802812B8[i].button & 0x1000) ? D_80281138[i].start_button + 1 : 0;
D_80281138[i].unk24[0] = (pfsManagerContPadData[i].button & 0x0800) ? D_80281138[i].unk24[0] + 1 : 0;
D_80281138[i].unk24[1] = (pfsManagerContPadData[i].button & 0x0400) ? D_80281138[i].unk24[1] + 1 : 0;
D_80281138[i].unk24[2] = (pfsManagerContPadData[i].button & 0x0200) ? D_80281138[i].unk24[2] + 1 : 0;
D_80281138[i].unk24[3] = (pfsManagerContPadData[i].button & 0x0100) ? D_80281138[i].unk24[3] + 1 : 0;
D_80281138[i].start_button = (pfsManagerContPadData[i].button & 0x1000) ? D_80281138[i].start_button + 1 : 0;
if(i == 0){
D_80281218.face_button[0] = (D_802812D0.button & 0x8000) ? D_80281218.face_button[0] + 1 : 0;
@@ -282,8 +282,8 @@ void func_8024E7C8(void){
D_80281250[i].unk2 = temp_v0_3; //previous buttons
D_80281250[i].unk8 = D_80281250[i].joystick[0];
D_80281250[i].unkC = D_80281250[i].joystick[1];
D_80281250[i].joystick[0] = func_8024E420(D_802812B8[i].stick_x, 7, 0x3B);
D_80281250[i].joystick[1] = func_8024E420(D_802812B8[i].stick_y, 7, 0x3D);
D_80281250[i].joystick[0] = func_8024E420(pfsManagerContPadData[i].stick_x, 7, 0x3B);
D_80281250[i].joystick[1] = func_8024E420(pfsManagerContPadData[i].stick_y, 7, 0x3D);
D_80281308[i] = ((D_80281250[i].unk4 != 0)
|| (D_80281250[i].unk8 != D_80281250[i].joystick[0])
@@ -297,82 +297,82 @@ void func_8024E7C8(void){
}
#endif
void func_8024EF74(){
void pfsManager_readData(){
func_8024F35C(0);
if(!D_80281318.errno)
osContGetReadData(D_802812B8);
if(!pfsManagerContStatus.errno)
osContGetReadData(pfsManagerContPadData);
}
void func_8024EFB0(void *arg0){
void pfsManager_handle(void *arg0){
do{
osRecvMesg(&D_802812D8, 0, 1);
if(D_80281328 == TRUE){
func_8024EF74();
osRecvMesg(&pfsManagerContPollingMsqQ, 0, 1);
if(pfsManagerBusy == TRUE){
pfsManager_readData();
}
else{
osSendMesg(&D_802812F0, 0, 0);
osSendMesg(&pfsManagerContReplyMsgQ, 0, 0);
}
}while(1);
}
void func_8024F05C(void){
osCreateMesgQueue(&D_802812D8, &D_802812B0, 1);
osCreateMesgQueue(&D_802812F0, &D_802812B4, 1);
osCreateThread(&D_80281330, 7, func_8024EFB0, NULL, D_802814E0 + 0x200, 0x28);
osSetEventMesg(OS_EVENT_SI, &D_802812D8, &D_802812B0);
osContInit(&D_802812D8, &D_80281130, &D_80281318);
void pfsManager_init(void){
osCreateMesgQueue(&pfsManagerContPollingMsqQ, &pfsManagerContPollingMsqBuf, 1);
osCreateMesgQueue(&pfsManagerContReplyMsgQ, &pfsManagerContReplyMsgBuf, 1);
osCreateThread(&pfsManagerThread, 7, pfsManager_handle, NULL, D_802814E0 + 0x200, 0x28);
osSetEventMesg(OS_EVENT_SI, &pfsManagerContPollingMsqQ, &pfsManagerContPollingMsqBuf);
osContInit(&pfsManagerContPollingMsqQ, &pfsManagerBitPattern, &pfsManagerContStatus);
osContSetCh(1);
func_8024F224();
func_802476DC();
osStartThread(&D_80281330);
osStartThread(&pfsManagerThread);
}
int func_8024F12C(void){
return D_80281318.errno ? 1 : 0;
bool pfsManager_contErr(void){
return pfsManagerContStatus.errno ? TRUE : FALSE;
}
void func_8024F150(void){
if(func_8024F12C())
if(pfsManager_contErr())
chOverlayNoController_spawn(0,0);
}
void func_8024F180(void){
if(func_8024F12C())
if(pfsManager_contErr())
chOverlayNoController_func_802DD040(0,0);
}
void func_8024F1B0(void){
if(D_80281328 == 0){
void pfsManager_getStartReadData(void){
if(pfsManagerBusy == 0){
func_8024F35C(1);
osContStartReadData(&D_802812D8);
osContStartReadData(&pfsManagerContPollingMsqQ);
}
}
void func_8024F1F0(void){
osRecvMesg(&D_802812D8, NULL, 1);
osRecvMesg(&pfsManagerContPollingMsqQ, NULL, 1);
func_8024E7C8();
}
void func_8024F224(void){
s32 iController, j;
s32 iCont, j;
for(iController = 0; iController < 4; iController++){
D_80281250[iController].unk0 = 0;
D_80281250[iController].unk2 = 0;
D_80281250[iController].unk4 = 0;
D_80281250[iController].unk6 = 0;
D_80281250[iController].joystick[0] = 0.0f;
D_80281250[iController].joystick[1] = 0.0f;
D_80281250[iController].unk8 = 0.0f;
D_80281250[iController].unkC = 0.0f;
for(iCont = 0; iCont < 4; iCont++){
D_80281250[iCont].unk0 = 0;
D_80281250[iCont].unk2 = 0;
D_80281250[iCont].unk4 = 0;
D_80281250[iCont].unk6 = 0;
D_80281250[iCont].joystick[0] = 0.0f;
D_80281250[iCont].joystick[1] = 0.0f;
D_80281250[iCont].unk8 = 0.0f;
D_80281250[iCont].unkC = 0.0f;
for(j = 0; j < 5; j++){
D_802810E0[iController][j] = 0;
D_802810E0[iCont][j] = 0;
}
for(j = 0; j < 14; j++){
D_80281138[iController].face_button[j] = 0;
D_80281138[iCont].face_button[j] = 0;
}
D_80281308[iController] = 0.0f;
D_80281308[iCont] = 0.0f;
}
}
@@ -384,12 +384,12 @@ void func_8024F328(s32 controller_index, s32 arg1){
D_80281138[controller_index].side_button[SIDE_BUTTON(BUTTON_Z)] = arg1;
}
OSMesgQueue * func_8024F344(void){
return &D_802812F0;
OSMesgQueue * pfsManager_getFrameReplyQ(void){
return &pfsManagerContReplyMsgQ;
}
OSMesgQueue *func_8024F350(void){
return &D_802812D8;
OSMesgQueue *pfsManager_getFrameMesgQ(void){
return &pfsManagerContPollingMsqQ;
}
void func_8024F35C(bool arg0){
@@ -399,16 +399,16 @@ void func_8024F35C(bool arg0){
func_8024F450();
if(arg0 || D_802816E8.validCount == 1){
D_80281328 = arg0;
pfsManagerBusy = arg0;
}
}
s32 func_8024F3B4(void){
return D_80281328;
bool pfsManager_isBusy(void){
return pfsManagerBusy;
}
int func_8024F3C4(int arg0){
return D_802812B8[arg0].button + D_802812B8[arg0].stick_x + D_802812B8[arg0].stick_y;
return pfsManagerContPadData[arg0].button + pfsManagerContPadData[arg0].stick_x + pfsManagerContPadData[arg0].stick_y;
}
OSContPad *func_8024F3F4(void){
@@ -425,8 +425,8 @@ void func_8024F400(void){
void func_8024F450(void){
if(!D_80275D38)
func_8024F400();
osRecvMesg(&D_802816E8, 0, 1);
osSetEventMesg(OS_EVENT_SI, &D_802812D8, &D_802812B0);
osRecvMesg(&D_802816E8, NULL, OS_MESG_BLOCK);
osSetEventMesg(OS_EVENT_SI, &pfsManagerContPollingMsqQ, &pfsManagerContPollingMsqBuf);
}
void func_8024F4AC(void){

2
src/core1/code_11AC0.c
View File

@@ -214,7 +214,7 @@ ALBank * D_80282108;
structBs D_80282110[0x20];
/* .code */
void func_8024F4E0(void){
void musicInstruments_init(void){
s32 size;
ALBankFile * bnk_f; //sp38
s32 i;

2
src/core1/code_12F10.c
View File

@@ -110,7 +110,7 @@ void func_80250C84(void){
s32 pfs_status;
func_8024F35C(4);
D_802823B4 = func_8024F344();
D_802823B4 = pfsManager_getFrameReplyQ();
pfs_status = osPfsInit(D_802823B4, &D_802823B8, 0);
if(pfs_status == PFS_ERR_ID_FATAL || pfs_status == PFS_ERR_DEVICE){
pfs_status = osMotorInit(D_802823B4, &D_802823B8, 0);

4
src/core1/code_18110.c
View File

@@ -12,7 +12,7 @@ s32 write_file_blocks(s32 filenum, s32 blockOffset, u8 *buffer, s32 blockCount)
s32 ret;
func_8024F35C(3);
ret = osEepromLongWrite(func_8024F344(), address, buffer, blockCount * EEPROM_BLOCK_SIZE);
ret = osEepromLongWrite(pfsManager_getFrameReplyQ(), address, buffer, blockCount * EEPROM_BLOCK_SIZE);
func_8024F35C(0);
return ret;
}
@@ -22,7 +22,7 @@ s32 load_file_blocks(s32 filenum, s32 blockOffset, u8 *buffer, s32 blockCount) {
s32 ret;
func_8024F35C(3);
ret = osEepromLongRead(func_8024F344(), address, buffer, blockCount * EEPROM_BLOCK_SIZE);
ret = osEepromLongRead(pfsManager_getFrameReplyQ(), address, buffer, blockCount * EEPROM_BLOCK_SIZE);
func_8024F35C(0);
return ret;
}

72
src/core1/code_1D00.c
View File

@@ -51,13 +51,13 @@ typedef struct struct_core1_1D00_5_s{
}unkC;
}OscState;
void amgrCreate(void);
void func_8023FE80(void *);
void audioManager_create(void);
void audioManager_handle(void *);
// void func_802403B8(void);
void amgrHandleDoneMsg(AudioInfo *info);
void audioManager_handleDoneMsg(AudioInfo *info);
void *func_802403B8(void *state);
void func_802403F0(void);
void amgrStartThread(void);
void audioManager_startThread(void);
s32 D_80275770 = 0;
@@ -141,7 +141,7 @@ struct {
OSMesg audioFrameMsgBuf[8];
OSMesgQueue audioReplyMsgQ;
OSMesg audioReplyMsgBuf[8];
} g_AudioManager;
} audioManager;
u8 pad_8027C178[0xE78];
ALHeap D_8027CFF0;
u8 * D_8027D000;
@@ -281,25 +281,25 @@ void func_8023FA64(ALSeqpConfig *arg0) {
arg0->stopOsc = stopOsc;
}
void func_8023FB1C(void){
void audioManager_init(void){
D_8027D000 = (u8 *) malloc(0x21000);
bzero(D_8027D000, 0x21000);
alHeapInit(&D_8027CFF0, D_8027D000, 0x21000);
if(osTvType != OS_TV_NTSC)
osViClock = 0x2e6025c;
amgrCreate();
func_80335220();
func_8024F4E0();
amgrStartThread();
audioManager_create();
sfxInstruments_init();
musicInstruments_init();
audioManager_startThread();
}
void amgrCreate(void) {
void audioManager_create(void) {
int i;
f32 var_f0;
osCreateMesgQueue(&D_8027D008, &D_8027D020, 0x32);
osCreateMesgQueue(&g_AudioManager.audioReplyMsgQ, g_AudioManager.audioReplyMsgBuf, 8); //audioReplyMesgQueue
osCreateMesgQueue(&g_AudioManager.audioFrameMsgQ, g_AudioManager.audioFrameMsgBuf, 8);
osCreateMesgQueue(&audioManager.audioReplyMsgQ, audioManager.audioReplyMsgBuf, 8); //audioReplyMesgQueue
osCreateMesgQueue(&audioManager.audioFrameMsgQ, audioManager.audioFrameMsgBuf, 8);
var_f0 = 733.333313f;
D_8027DD74 = (s32)var_f0;
if ((f32) D_8027DD74 < var_f0) {
@@ -326,28 +326,28 @@ void amgrCreate(void) {
D_8027D5C0[i].unk10 = alHeapDBAlloc(0, 0, D_8027DD50.heap, 1, 0x200);
for(i = 0; i < 2; i++){
g_AudioManager.ACMDList[i] = malloc(20000);
audioManager.ACMDList[i] = malloc(20000);
}
D_8027DD80 = 2500;
for(i = 0; i < 3; i++){
g_AudioManager.audioInfo[i] = alHeapDBAlloc(0, 0, D_8027DD50.heap, 1, 0x10);
g_AudioManager.audioInfo[i]->unk8 = 0;
g_AudioManager.audioInfo[i]->unkC = g_AudioManager.audioInfo[i];
g_AudioManager.audioInfo[i]->data = malloc(D_8027DD7C * 4);
audioManager.audioInfo[i] = alHeapDBAlloc(0, 0, D_8027DD50.heap, 1, 0x10);
audioManager.audioInfo[i]->unk8 = 0;
audioManager.audioInfo[i]->unkC = audioManager.audioInfo[i];
audioManager.audioInfo[i]->data = malloc(D_8027DD7C * 4);
}
osCreateThread(&g_AudioManager.thread, 4, &func_8023FE80, 0, &D_8027CFF0, 0x32);
osCreateThread(&audioManager.thread, 4, &audioManager_handle, 0, &D_8027CFF0, 0x32);
}
void func_8023FE80(void *arg0) {
void audioManager_handle(void *arg0) {
s32 phi_s1;
phi_s1 = 1;
while(1){
osRecvMesg(&g_AudioManager.audioFrameMsgQ, NULL, OS_MESG_BLOCK);
if (amgr_handleFrameMsg(g_AudioManager.audioInfo[D_8027DCC8 % 3], D_80275848)){
osRecvMesg(&audioManager.audioFrameMsgQ, NULL, OS_MESG_BLOCK);
if (audioManager_handleFrameMsg(audioManager.audioInfo[D_8027DCC8 % 3], D_80275848)){
if(phi_s1 == 0){
osRecvMesg(&g_AudioManager.audioReplyMsgQ, &D_80275844, OS_MESG_BLOCK);
amgrHandleDoneMsg(D_80275844->unk4);
osRecvMesg(&audioManager.audioReplyMsgQ, &D_80275844, OS_MESG_BLOCK);
audioManager_handleDoneMsg(D_80275844->unk4);
D_80275848 = D_80275844->unk4;
}else{
phi_s1 += -1;
@@ -364,7 +364,7 @@ void func_8023FFD4(s32 arg0, s32 arg1, s32 arg2){
return;
}
bool amgr_handleFrameMsg(AudioInfo *info, AudioInfo *prev_info){
bool audioManager_handleFrameMsg(AudioInfo *info, AudioInfo *prev_info){
s16 *outbuffer;
Acmd *sp38;
s32 sp34;
@@ -399,7 +399,7 @@ bool amgr_handleFrameMsg(AudioInfo *info, AudioInfo *prev_info){
info->frameSamples = D_8027DD78;
}
sp38 = n_alAudioFrame(g_AudioManager.ACMDList[D_8027DCD0], &sp34, outbuffer, info->frameSamples);
sp38 = n_alAudioFrame(audioManager.ACMDList[D_8027DCD0], &sp34, outbuffer, info->frameSamples);
if(D_8027DD80 < sp34){
func_80247F24(2, 2000);
@@ -411,14 +411,14 @@ bool amgr_handleFrameMsg(AudioInfo *info, AudioInfo *prev_info){
if(sp34 == 0){
return 0;
}else{
func_802535A8(g_AudioManager.ACMDList[D_8027DCD0], sp38, &g_AudioManager.audioReplyMsgQ, &info->unk8);
func_802535A8(audioManager.ACMDList[D_8027DCD0], sp38, &audioManager.audioReplyMsgQ, &info->unk8);
func_80250650();
D_8027DCD0 ^= 1;
return 1;
}
}
void amgrHandleDoneMsg(AudioInfo *info)
void audioManager_handleDoneMsg(AudioInfo *info)
{
static int D_8027584C = TRUE;
if (osAiGetLength() >> 2 == 0 && D_8027584C == FALSE) {
@@ -527,22 +527,22 @@ void func_802403F0(void) {
D_8027DCC8 += 1;
}
void amgrStopThread(void){
void audioManager_stopThread(void){
if(D_80275774){
D_80275774 = 0;
osStopThread(&g_AudioManager.thread);
osStopThread(&audioManager.thread);
}
}
void amgrStartThread(void){
void audioManager_startThread(void){
if(D_80275774 == 0){
D_80275774 = 1;
osStartThread(&g_AudioManager.thread);
osStartThread(&audioManager.thread);
}
}
OSThread * amgrGetThread(void){
return &g_AudioManager.thread;
OSThread * audioManager_getThread(void){
return &audioManager.thread;
}
ALHeap * func_802405B8(void){
@@ -557,6 +557,6 @@ OSIoMesg * func_802405D0(void){
return &D_8027D0E8;
}
OSMesgQueue * amgr_getFrameMesgQueue(void){
return &g_AudioManager.audioFrameMsgQ;
OSMesgQueue * audioManager_getFrameMesgQueue(void){
return &audioManager.audioFrameMsgQ;
}

8
src/core1/code_8C50.c
View File

@@ -74,7 +74,7 @@ s32 D_8027FC18;
s32 D_8027FC1C;
s32 D_8027FC20;
s32 D_8027FC24;
u8 pad_8027FC28[2040]; //stack for thread D_80280428;
u8 D_8027FC28[2040]; //stack for thread D_80280428;
OSThread D_80280428;
Struct_Core1_8C50_s * D_802805D8[20];
volatile s32 D_80280628;
@@ -332,7 +332,7 @@ void func_802471D8(OSMesg arg0){
}
void func_802471EC(void){
osSendMesg(amgr_getFrameMesgQueue(), NULL, OS_MESG_NOBLOCK);
osSendMesg(audioManager_getFrameMesgQueue(), NULL, OS_MESG_NOBLOCK);
func_80247224();
}
@@ -426,7 +426,7 @@ void func_802473B4(void *arg0){
else if((u32)msg == CORE1_8C50_EVENT_FAULT) { do{}while(1); }
else if((u32)msg == CORE1_8C50_EVENT_PRENMI) { func_8024730C(); }
else if((u32)msg == 12) { }
else if((u32)msg == CORE1_8C50_EVENT_CONT_TIMER) { func_8024F1B0(); }
else if((u32)msg == CORE1_8C50_EVENT_CONT_TIMER) { pfsManager_getStartReadData(); }
else if((u32)msg >= 100) {
if(*(u32*)msg == 0){ func_80246A64(msg); }
else if(*(u32*)msg == 1){ func_80246A84(msg); }
@@ -458,7 +458,7 @@ void func_80247560(void){
tmp_v0 = D_8027EF40;
while((u32)tmp_v0 % 0x10){((u32)tmp_v0)++;}
D_80275950.t.yield_data_ptr = tmp_v0;
osCreateThread(&D_80280428, 5, func_802473B4, NULL, &pad_8027FC28[2040], 60);
osCreateThread(&D_80280428, 5, func_802473B4, NULL, &D_8027FC28[2040], 60);
osStartThread(&D_80280428);
}