some cleanup of f_pc/f_op files (#2254)

* cleanup f_pc files

* cleanup f_op files

* fix a couple f_op_actor_mng functions

* minor JSystem work
This commit is contained in:
TakaRikka
2024-11-29 08:24:26 -08:00
committed by GitHub
parent 6482fe7535
commit 073992df8d
903 changed files with 6835 additions and 6587 deletions
+47 -47
View File
@@ -13,9 +13,9 @@
/* 80020ACC-80020AE8 001C+00 s=1 e=0 z=0 None .text fpcCtRq_isCreatingByID__FP10create_tagPUi
*/
bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_procID) {
create_request* pReq = static_cast<create_request*>(i_createTag->mBase.mpTagData);
return pReq->mBsPcId == *i_procID;
bool fpcCtRq_isCreatingByID(create_tag* i_createTag, fpc_ProcID* i_id) {
create_request* req = (create_request*)i_createTag->base.mpTagData;
return req->id == *i_id;
}
/* 80020AE8-80020B20 0038+00 s=0 e=2 z=0 None .text fpcCtRq_IsCreatingByID__FUi */
@@ -25,81 +25,82 @@ BOOL fpcCtRq_IsCreatingByID(fpc_ProcID i_id) {
/* 80020B20-80020B5C 003C+00 s=1 e=0 z=0 None .text fpcCtRq_CreateQTo__FP14create_request */
void fpcCtRq_CreateQTo(create_request* i_request) {
fpcCtTg_CreateQTo(&i_request->mBase);
fpcLy_CreatedMesg(i_request->mpLayer);
fpcLy_CancelQTo(&i_request->mMtdTg);
fpcCtTg_CreateQTo(&i_request->base);
fpcLy_CreatedMesg(i_request->layer);
fpcLy_CancelQTo(&i_request->method_tag);
}
/* 80020B5C-80020BA0 0044+00 s=1 e=0 z=0 None .text fpcCtRq_ToCreateQ__FP14create_request */
void fpcCtRq_ToCreateQ(create_request* i_request) {
fpcLy_CreatingMesg(i_request->mpLayer);
fpcLy_ToCancelQ(i_request->mpLayer, &i_request->mMtdTg);
fpcCtTg_ToCreateQ(&i_request->mBase);
fpcLy_CreatingMesg(i_request->layer);
fpcLy_ToCancelQ(i_request->layer, &i_request->method_tag);
fpcCtTg_ToCreateQ(&i_request->base);
}
/* 80020BA0-80020C14 0074+00 s=2 e=0 z=0 None .text fpcCtRq_Delete__FP14create_request */
BOOL fpcCtRq_Delete(create_request* i_request) {
fpcCtRq_CreateQTo(i_request);
if (i_request->mpCtRqMtd != NULL && fpcMtd_Method(i_request->mpCtRqMtd->mpDelete, i_request) == 0) {
return 0;
} else {
if (i_request->mpRes) {
i_request->mpRes->mpCtRq = NULL;
}
cMl::free(i_request);
return 1;
if (i_request->methods != NULL && fpcMtd_Method(i_request->methods->delete_method, i_request) == 0) {
return FALSE;
}
if (i_request->process != NULL) {
i_request->process->create_req = NULL;
}
cMl::free(i_request);
return TRUE;
}
/* 80020C14-80020CAC 0098+00 s=2 e=2 z=0 None .text fpcCtRq_Cancel__FP14create_request */
BOOL fpcCtRq_Cancel(create_request* i_request) {
base_process_class* pProc;
if (i_request != NULL && !i_request->mbIsCancelling) {
i_request->mbIsCancelling = TRUE;
pProc = i_request->mpRes;
base_process_class* pproc;
if (i_request != NULL && !i_request->is_cancel) {
i_request->is_cancel = TRUE;
pproc = i_request->process;
if (pProc != NULL && !fpcDt_Delete(pProc))
if (pproc != NULL && !fpcDt_Delete(pproc))
return FALSE;
if (i_request->mpCtRqMtd != NULL && !fpcMtd_Method(i_request->mpCtRqMtd->mpCancel, i_request))
if (i_request->methods != NULL && !fpcMtd_Method(i_request->methods->cancel_method, i_request))
return FALSE;
return fpcCtRq_Delete(i_request);
} else {
return TRUE;
}
return TRUE;
}
/* 80020CAC-80020CC8 001C+00 s=0 e=1 z=0 None .text fpcCtRq_IsDoing__FP14create_request */
s32 fpcCtRq_IsDoing(create_request* i_request) {
BOOL fpcCtRq_IsDoing(create_request* i_request) {
if (i_request != NULL)
return i_request->mbIsCreating;
return i_request->is_doing;
else
return FALSE;
}
/* 80020CC8-80020D84 00BC+00 s=1 e=0 z=0 None .text fpcCtRq_Do__FP14create_request */
BOOL fpcCtRq_Do(create_request* i_request) {
s32 phase = cPhs_COMPLEATE_e;
int phase = cPhs_COMPLEATE_e;
if (i_request->mpCtRqMtd != NULL) {
cPhs__Handler pHandler = i_request->mpCtRqMtd->mpHandler;
if (i_request->methods != NULL) {
cPhs__Handler pHandler = i_request->methods->phase_handler;
if (pHandler != NULL) {
i_request->mbIsCreating = TRUE;
i_request->is_doing = TRUE;
phase = pHandler(i_request);
i_request->mbIsCreating = FALSE;
i_request->is_doing = FALSE;
}
}
switch (phase) {
case cPhs_COMPLEATE_e: {
s32 success = fpcEx_ToExecuteQ(i_request->mpRes);
int success = fpcEx_ToExecuteQ(i_request->process);
if (success == 0)
return fpcCtRq_Cancel(i_request);
else
return fpcCtRq_Delete(i_request);
}
case 3:
case cPhs_UNK3_e:
case cPhs_ERROR_e:
return fpcCtRq_Cancel(i_request);
}
@@ -108,26 +109,25 @@ BOOL fpcCtRq_Do(create_request* i_request) {
}
/* 80020D84-80020DB0 002C+00 s=0 e=1 z=0 None .text fpcCtRq_Handler__Fv */
void fpcCtRq_Handler() {
fpcCtIt_Method((fpcCtIt_MethodFunc)fpcCtRq_Do, NULL);
}
/* 80020DB0-80020E38 0088+00 s=0 e=2 z=0 None .text
* fpcCtRq_Create__FP11layer_classUlP27create_request_method_class */
create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_method_class* i_CtRqMethods) {
create_request* pReq = (create_request*)cMl::memalignB(-4, i_size);
create_request* fpcCtRq_Create(layer_class* i_layer, u32 i_size, create_request_method_class* i_methods) {
create_request* req = (create_request*)cMl::memalignB(-4, i_size);
if (pReq != NULL) {
fpcCtTg_Init(&pReq->mBase, pReq);
fpcMtdTg_Init(&pReq->mMtdTg, (process_method_tag_func)fpcCtRq_Cancel, pReq);
pReq->mpLayer = i_layer;
pReq->mpCtRqMtd = i_CtRqMethods;
pReq->mBsPcId = fpcBs_MakeOfId();
pReq->mpRes = NULL;
pReq->mbIsCancelling = FALSE;
fpcCtRq_ToCreateQ(pReq);
if (req != NULL) {
fpcCtTg_Init(&req->base, req);
fpcMtdTg_Init(&req->method_tag, (process_method_tag_func)fpcCtRq_Cancel, req);
req->layer = i_layer;
req->methods = i_methods;
req->id = fpcBs_MakeOfId();
req->process = NULL;
req->is_cancel = FALSE;
fpcCtRq_ToCreateQ(req);
}
return pReq;
return req;
}