Skip to content

Use TH_SELF definition in place of 0 for IOP thread related funcs #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fjtrujy merged 1 commit into from
Jul 17, 2026
Merged

Use TH_SELF definition in place of 0 for IOP thread related funcs #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions iop/arcade/acata/src/ata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ static void ata_thread(void *arg)
}
argt->atah = 0;
a_ops->ao_done(atah, v10);
CancelWakeupThread(0);
CancelWakeupThread(TH_SELF);
}
else
{
Expand Down Expand Up @@ -303,7 +303,7 @@ int acAtaModuleStart(int argc, char **argv)
Atac.requestq.q_prev = 0;
Atac.requestq.q_next = 0;
DelayThread(delay);
ChangeThreadPriority(0, 123);
ChangeThreadPriority(TH_SELF, 123);
index_v12 = ata_probe((acAtaReg)0xB6000000);
Atac.active = index_v12;
if ( index_v12 == 0 )
Expand Down
4 changes: 2 additions & 2 deletions iop/arcade/acata/src/atacmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
break;
}
}
ChangeThreadPriority(0, cmdpri);
ChangeThreadPriority(TH_SELF, cmdpri);
cmd = ata->ac_command;
count = 5;
flag_v8 = atah->a_flag;
Expand All @@ -158,7 +158,7 @@ static int ata_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
break;
}
}
ChangeThreadPriority(0, pri);
ChangeThreadPriority(TH_SELF, pri);
// cppcheck-suppress knownConditionTrueFalse
if ( atah->a_state >= 0x1FFu )
{
Expand Down
4 changes: 2 additions & 2 deletions iop/arcade/acata/src/atapicmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
}
if ( ret_v5 < 0 )
return ret_v5;
ChangeThreadPriority(0, cmdpri);
ChangeThreadPriority(TH_SELF, cmdpri);
ret_v5 = atapi_packet_send((acAtaReg)0xB6000000, &atapi->ap_packet, flag);
if ( ret_v5 >= 0 )
{
Expand Down Expand Up @@ -369,7 +369,7 @@ static int atapi_ops_command(struct ac_ata_h *atah, int cmdpri, int pri)
}
}
}
ChangeThreadPriority(0, pri);
ChangeThreadPriority(TH_SELF, pri);
if ( ret_v5 < 0 )
return ret_v5;
if ( atah->a_state < 0x1FFu )
Expand Down
4 changes: 2 additions & 2 deletions iop/arcade/acram/src/ram.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static int ram_dma_request(struct ram_softc *ramc, acRamT ram)
acRamAddr addr;

dma = acDmaSetup(&ramc->dma, (acDmaOpsData *)&ops_22, 7, 64, output);
CancelWakeupThread(0);
CancelWakeupThread(TH_SELF);
ret = acDmaRequest(dma);
if ( ret < 0 )
break;
Expand Down Expand Up @@ -360,7 +360,7 @@ int acRamModuleStart(int argc, char **argv)
--retry;
}
*((volatile acUint16 *)0xB4640000) = 0;
ChangeThreadPriority(0, 123);
ChangeThreadPriority(TH_SELF, 123);
USec2SysClock(0x411Bu, &v16);
Ramc.refresh = v16.lo;
ret = SetAlarm(&v16, ram_refresh, &Ramc);
Expand Down
2 changes: 1 addition & 1 deletion iop/cdvd/cdvdfsv/src/cdvdfsv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ int sceCdChangeThreadPriority(int priority)
if ( priority == 9 )
priority = 10;
// Unofficial: remove unused ReferThreadStatus
ChangeThreadPriority(0, 8);
ChangeThreadPriority(TH_SELF, 8);
ChangeThreadPriority(g_cdvdfsv_thids[0], priority - 1);
ChangeThreadPriority(g_cdvdfsv_thids[2], priority);
ChangeThreadPriority(g_cdvdfsv_thids[1], priority);
Expand Down
2 changes: 1 addition & 1 deletion iop/sound/sdrdrv/src/sdd_cb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ static void sceSifCmdLoop2(SifRpcClientData_t *cd, SdrEECBInfo *cbi)
if ( cbi->m_eeCBData.mode == eeCBDataSend.mode )
{
cbi->m_eeCBData.mode = 0;
iCancelWakeupThread(0);
iCancelWakeupThread(TH_SELF);
CpuResumeIntr(state);
break;
}
Expand Down
6 changes: 3 additions & 3 deletions iop/sound/sdrdrv/src/sdd_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,8 @@ int sceSdrChangeThreadPriority(int priority_main, int priority_cb)
Kprintf(" callback th. priority is higher than main th. priority.\n");
}
cur_priority = (priority_cb < priority_main) ? priority_main : priority_cb;
ReferThreadStatus(0, &thstatus);
ChangeThreadPriority(0, 8);
ReferThreadStatus(TH_SELF, &thstatus);
ChangeThreadPriority(TH_SELF, 8);
ret = 0;
if ( g_sdrInfo.m_thid_main > 0 )
ret = ChangeThreadPriority(g_sdrInfo.m_thid_main, priority_main);
Expand All @@ -154,6 +154,6 @@ int sceSdrChangeThreadPriority(int priority_main, int priority_cb)
if ( ret < 0 )
return ret;
g_eeCBInfo.m_initial_priority_cb = cur_priority;
ChangeThreadPriority(0, thstatus.currentPriority);
ChangeThreadPriority(TH_SELF, thstatus.currentPriority);
return 0;
}
6 changes: 3 additions & 3 deletions iop/system/iomanx/src/iomanX.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,8 +385,8 @@ void iomanX_StdioInit(int mode)
BootMode = QueryBootMode(3);
if ( BootMode && (BootMode[1] & 4) )
return;
ReferThreadStatus(0, &thinfo);
ChangeThreadPriority(0, 4);
ReferThreadStatus(TH_SELF, &thinfo);
ChangeThreadPriority(TH_SELF, 4);
#endif
#ifdef _IOP
switch ( mode )
Expand Down Expand Up @@ -417,7 +417,7 @@ void iomanX_StdioInit(int mode)
open_tty_handles("tty:");
#endif
#ifdef _IOP
ChangeThreadPriority(0, thinfo.currentPriority);
ChangeThreadPriority(TH_SELF, thinfo.currentPriority);
#endif
}

Expand Down
16 changes: 8 additions & 8 deletions iop/system/modload/src/modload.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ void SelfUnloadModule(void)
Kprintf("SelfUnloadModule(): panic !!! Unload fail semerror=%d !!!\n", sema_res);
}
StartThread(modLoadCB, &mltargs);
ChangeThreadPriority(0, 123);
ChangeThreadPriority(TH_SELF, 123);
WaitEventFlag(ModuleLoaderSync, 1u, 17, &efbits);
SignalSema(ModuleLoaderMutex);
Kprintf("SelfUnloadModule(): panic !!! Unload fail error=%d !!!\n", ret_tmp);
Expand Down Expand Up @@ -754,7 +754,7 @@ static void ExecModuleLoad(void *userdata)
{
case 0:
mi = do_load(mltargs, &res_tmp);
ChangeThreadPriority(0, 8);
ChangeThreadPriority(TH_SELF, 8);
break;
case 1:
mi = SearchModuleCBByID(mltargs->modid);
Expand All @@ -770,7 +770,7 @@ static void ExecModuleLoad(void *userdata)
break;
case 3:
mi = do_load(mltargs, &res_tmp);
ChangeThreadPriority(0, 8);
ChangeThreadPriority(TH_SELF, 8);
if ( !mi )
{
break;
Expand Down Expand Up @@ -803,7 +803,7 @@ static void ExecModuleLoad(void *userdata)
break;
}
modid_2 = mltargs->modid_2;
ChangeThreadPriority(0, 1);
ChangeThreadPriority(TH_SELF, 1);
TerminateThread(modid_2);
DeleteThread(modid_2);
SignalSema(ModuleLoaderMutex);
Expand All @@ -825,7 +825,7 @@ static void ExecModuleLoad(void *userdata)
}
if ( mltargs->thread_ef )
{
ChangeThreadPriority(0, 1);
ChangeThreadPriority(TH_SELF, 1);
SetEventFlag(mltargs->thread_ef, 1u);
}
return;
Expand Down Expand Up @@ -1076,7 +1076,7 @@ static int start_module(ModuleInfo_t *module_info, const char *data, int arglen,
module_info->newflags |= 2;
module_result =
((int (*)(int argc, char **argv, elf_header_t **eh, ModuleInfo_t *mi))module_info->entry)(in_argc, in_argv_ptrs, 0, module_info);
ChangeThreadPriority(0, 8);
ChangeThreadPriority(TH_SELF, 8);
if ( result_out )
{
*result_out = module_result;
Expand Down Expand Up @@ -1185,7 +1185,7 @@ stop_module(ModuleInfo_t *module_info, int command, int modid_2, int arglen, con
// TODO: save/restore gp register
module_result =
((int (*)(int argc, char **argv, elf_header_t **eh, ModuleInfo_t *mi))module_info->entry)(-in_argc, in_argv_ptrs, 0, module_info);
ChangeThreadPriority(0, 8);
ChangeThreadPriority(TH_SELF, 8);
if ( result_out )
*result_out = module_result;
module_info->newflags &= 0xFFF0;
Expand Down Expand Up @@ -2103,7 +2103,7 @@ __asm__ (

int ReBootStart(const char *command, unsigned int flags)
{
ChangeThreadPriority(0, 7);
ChangeThreadPriority(TH_SELF, 7);
TerminateResidentLibraries(" ReBootStart:ei: Terminate resident Libraries\n", flags, 2);
return CpuExecuteKmode(TerminateResidentEntriesDI, command, flags);
}
Expand Down
6 changes: 3 additions & 3 deletions iop/system/msifrpc/src/msifrpc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -648,8 +648,8 @@ void sceSifMEntryLoop(sceSifMServeEntry *se, int request, sceSifMRpcFunc func, s
int state;
struct msif_msgbox_msg *arg;

ReferThreadStatus(0, &thinfo);
ChangeThreadPriority(0, 16);
ReferThreadStatus(TH_SELF, &thinfo);
ChangeThreadPriority(TH_SELF, 16);
se->command = request;
se->func = func;
se->cfunc = cfunc;
Expand Down Expand Up @@ -690,7 +690,7 @@ void sceSifMEntryLoop(sceSifMServeEntry *se, int request, sceSifMRpcFunc func, s
else
{
printf("msifrpc: quit\n");
ChangeThreadPriority(0, thinfo.currentPriority);
ChangeThreadPriority(TH_SELF, thinfo.currentPriority);
break;
}
}
Expand Down
2 changes: 1 addition & 1 deletion iop/system/threadman/src/thcommon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ int post_boot_callback_1(iop_init_entry_t *next, int delayed)
int post_boot_callback_2(iop_init_entry_t *next, int delayed)
{
CpuEnableIntr();
ChangeThreadPriority(0, 126);
ChangeThreadPriority(TH_SELF, 126);
if (!next->callback) {
while (1) {
DelayThread(1000000);
Expand Down
Loading