diff options
| author | Rozelette <Rozelette@users.noreply.github.com> | 2021-04-19 16:44:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-19 17:44:12 -0400 |
| commit | e97f10a6fa573e8b817ed03a4674d52b1818dafa (patch) | |
| tree | 25821c9094c4aea2f1ad167c6227d2d2afbcd3f2 /src/boot_O2_g3 | |
| parent | 768ca0839b862f1eff09661d9b20af51f70a738e (diff) | |
sys_slowly OK (#101)
* sys_slowly OK
* Feedback
* rename type member
Diffstat (limited to 'src/boot_O2_g3')
| -rw-r--r-- | src/boot_O2_g3/boot_main.c | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/idle.c | 4 | ||||
| -rw-r--r-- | src/boot_O2_g3/irqmgr.c | 2 | ||||
| -rw-r--r-- | src/boot_O2_g3/z_std_dma.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/boot_O2_g3/boot_main.c b/src/boot_O2_g3/boot_main.c index 15f975124..2a7d69f98 100644 --- a/src/boot_O2_g3/boot_main.c +++ b/src/boot_O2_g3/boot_main.c @@ -9,6 +9,6 @@ void bootproc(void) { osUnmapTLBAll(); gCartHandle = osCartRomInit(); StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle"); - osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack), 12); + osCreateThread(&sIdleThread, Z_THREAD_ID_IDLE, Idle_ThreadEntry, NULL, sIdleThreadStack + sizeof(sIdleThreadStack), Z_PRIORITY_IDLE); osStartThread(&sIdleThread); } diff --git a/src/boot_O2_g3/idle.c b/src/boot_O2_g3/idle.c index 3da1cb5f7..e4acb7b55 100644 --- a/src/boot_O2_g3/idle.c +++ b/src/boot_O2_g3/idle.c @@ -67,7 +67,7 @@ void Idle_InitCodeAndMemory(void) { void Main_ThreadEntry(void* arg) { StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack + sizeof(sIrqMgrStack), 0, 256, "irqmgr"); - IrqMgr_Init(&gIrqMgr, &sIrqMgrStackInfo, 18, 1); + IrqMgr_Init(&gIrqMgr, &sIrqMgrStackInfo, Z_PRIORITY_IRQMGR, 1); DmaMgr_Start(); Idle_InitCodeAndMemory(); main(arg); @@ -104,7 +104,7 @@ void Idle_ThreadEntry(void* arg) { Idle_InitVideo(); osCreatePiManager(150, &gPiMgrCmdQ, sPiMgrCmdBuff, ARRAY_COUNT(sPiMgrCmdBuff)); StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 1024, "main"); - osCreateThread(&gMainThread, 3, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack), 12); + osCreateThread(&gMainThread, Z_THREAD_ID_MAIN, Main_ThreadEntry, arg, sMainStack + sizeof(sMainStack), Z_PRIORITY_MAIN); osStartThread(&gMainThread); osSetThreadPri(NULL, 0); diff --git a/src/boot_O2_g3/irqmgr.c b/src/boot_O2_g3/irqmgr.c index cc3c917f2..143a8a0f2 100644 --- a/src/boot_O2_g3/irqmgr.c +++ b/src/boot_O2_g3/irqmgr.c @@ -167,6 +167,6 @@ void IrqMgr_Init(IrqMgr* irqmgr, void* stack, OSPri pri, u8 retraceCount) { osSetEventMesg(0xE, &irqmgr->irqQueue, (OSMesg)0x29D); osViSetEvent(&irqmgr->irqQueue, (OSMesg)0x29A, retraceCount); - osCreateThread(&irqmgr->thread, 0x13, (osCreateThread_func)IrqMgr_ThreadEntry, irqmgr, stack, pri); + osCreateThread(&irqmgr->thread, Z_THREAD_ID_IRQMGR, (osCreateThread_func)IrqMgr_ThreadEntry, irqmgr, stack, pri); osStartThread(&irqmgr->thread); } diff --git a/src/boot_O2_g3/z_std_dma.c b/src/boot_O2_g3/z_std_dma.c index e7c153a49..f293eaf69 100644 --- a/src/boot_O2_g3/z_std_dma.c +++ b/src/boot_O2_g3/z_std_dma.c @@ -108,7 +108,7 @@ void DmaMgr_ProcessMsg(DmaRequest* req) { size = req->size; index = DmaMgr_FindDmaIndex(vrom); - + if ((index >= 0) && (index < numDmaEntries)) { dmaEntry = &dmadata[index]; if (dmaEntry->romEnd == 0) { @@ -144,18 +144,18 @@ void DmaMgr_ThreadEntry(void* a0) { while (1) { osRecvMesg(&sDmaMgrMsgQueue, &msg, OS_MESG_BLOCK); - + if (msg == NULL) { break; } - + req = (DmaRequest *)msg; DmaMgr_ProcessMsg(req); if (req->notifyQueue) { osSendMesg(req->notifyQueue, req->notifyMsg, OS_MESG_NOBLOCK); } - + } } @@ -211,7 +211,7 @@ void DmaMgr_Start() { osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, ARRAY_COUNT(sDmaMgrMsgs)); StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 256, dmamgrThreadName); - osCreateThread(&sDmaMgrThread, 18, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack), 17); + osCreateThread(&sDmaMgrThread, Z_THREAD_ID_DMAMGR, DmaMgr_ThreadEntry, NULL, sDmaMgrStack + sizeof(sDmaMgrStack), Z_PRIORITY_DMAMGR); osStartThread(&sDmaMgrThread); } #else |
