[n64-jp-1.1] CIC6105.c matched (#1843)

* match CIC6105.c

* Renames and fixes

* Fix bss

* format

* Review

* Version check inequalities
This commit is contained in:
Anghelo Carvajal
2026-03-26 07:59:39 -03:00
committed by GitHub
parent 02eafced87
commit a9da608e18
14 changed files with 117 additions and 19 deletions
+2 -2
View File
@@ -16,7 +16,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
OSTimer timer;
s32 msg;
if (SREG(20) > 0) {
if (R_AUDIOMGR_DEBUG_LEVEL > 0) {
audioMgr->rspTask = NULL;
}
@@ -37,7 +37,7 @@ void AudioMgr_HandleRetrace(AudioMgr* audioMgr) {
Sched_SendNotifyMsg(audioMgr->sched);
}
if (SREG(20) >= 2) {
if (R_AUDIOMGR_DEBUG_LEVEL >= 2) {
rspTask = NULL;
} else {
rspTask = AudioThread_Update();
+1 -1
View File
@@ -236,7 +236,7 @@ retry:
void Graph_UpdateGame(GameState* gameState) {
GameState_GetInput(gameState);
GameState_IncrementFrameCount(gameState);
if (SREG(20) < 3) {
if (R_AUDIOMGR_DEBUG_LEVEL < 3) {
Audio_Update();
}
}
+2
View File
@@ -3,6 +3,8 @@
#include "alignment.h"
#include "macros.h"
#pragma increment_block_number "n64-us:188"
u32 __osFlashID[4] ALIGNED(8);
OSIoMesg __osFlashMsg ALIGNED(8);
OSMesgQueue __osFlashMessageQ ALIGNED(8);
+1 -1
View File
@@ -6,7 +6,7 @@
#include "macros.h"
#pragma increment_block_number "n64-us:124"
#pragma increment_block_number "n64-us:122"
// The bss index at this point should be 184
+7 -7
View File
@@ -25,7 +25,7 @@ extern u64 njpgdspMainDataStart[];
* Configures and schedules a JPEG decoder task and waits for it to finish.
*/
void Jpeg_ScheduleDecoderTask(JpegContext* jpegCtx) {
static OSTask_t sJpegTask = {
static OSTask sJpegTask = {
M_NJPEGTASK, // type
0, // flags
NULL, // ucode_boot
@@ -54,18 +54,18 @@ void Jpeg_ScheduleDecoderTask(JpegContext* jpegCtx) {
workBuf->taskData.qTableUPtr = &workBuf->qTableU;
workBuf->taskData.qTableVPtr = &workBuf->qTableV;
sJpegTask.flags = 0;
sJpegTask.ucode_boot = SysUcode_GetUCodeBoot();
sJpegTask.ucode_boot_size = SysUcode_GetUCodeBootSize();
sJpegTask.yield_data_ptr = (u64*)&workBuf->yieldData;
sJpegTask.data_ptr = (u64*)&workBuf->taskData;
sJpegTask.t.flags = 0;
sJpegTask.t.ucode_boot = SysUcode_GetUCodeBoot();
sJpegTask.t.ucode_boot_size = SysUcode_GetUCodeBootSize();
sJpegTask.t.yield_data_ptr = (u64*)&workBuf->yieldData;
sJpegTask.t.data_ptr = (u64*)&workBuf->taskData;
jpegCtx->scTask.next = NULL;
jpegCtx->scTask.flags = OS_SC_NEEDS_RSP;
jpegCtx->scTask.msgQ = &jpegCtx->mq;
jpegCtx->scTask.msg = NULL;
jpegCtx->scTask.framebuffer = NULL;
jpegCtx->scTask.list.t = sJpegTask;
jpegCtx->scTask.list = sJpegTask;
osSendMesg(&gScheduler.cmdQueue, (OSMesg*)&jpegCtx->scTask, OS_MESG_BLOCK);
Sched_SendNotifyMsg(&gScheduler); // osScKickEntryMsg