mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-13 11:24:40 +00:00
T() macro 2 (#2073)
* T() in idle.c, irqmgr.c, padmgr.c, z_locale.c * T() in z_sram.c * T() in z_bgcheck.c, z_scene.c * format
This commit is contained in:
Dragorn421
GitHub
parent
1f2e82c39e
commit
37f0774778
7 changed files with 125 additions and 137 deletions
|
|
@ -117,10 +117,10 @@ void IrqMgr_SendMesgToClients(IrqMgr* irqMgr, OSMesg msg) {
|
|||
|
||||
for (client = irqMgr->clients; client != NULL; client = client->prev) {
|
||||
if (MQ_IS_FULL(client->queue)) {
|
||||
// "irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d"
|
||||
PRINTF(
|
||||
VT_COL(RED, WHITE) "irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST,
|
||||
client->queue, MQ_GET_COUNT(client->queue));
|
||||
PRINTF(VT_COL(RED, WHITE) T("irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n",
|
||||
"irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d\n")
|
||||
VT_RST,
|
||||
client->queue, MQ_GET_COUNT(client->queue));
|
||||
} else {
|
||||
osSendMesg(client->queue, msg, OS_MESG_NOBLOCK);
|
||||
}
|
||||
|
|
@ -140,10 +140,9 @@ void IrqMgr_JamMesgToClients(IrqMgr* irqMgr, OSMesg msg) {
|
|||
|
||||
for (client = irqMgr->clients; client != NULL; client = client->prev) {
|
||||
if (MQ_IS_FULL(client->queue)) {
|
||||
// "irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d"
|
||||
PRINTF(
|
||||
VT_COL(RED, WHITE) "irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST,
|
||||
client->queue, MQ_GET_COUNT(client->queue));
|
||||
PRINTF(VT_COL(RED, WHITE) T("irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n",
|
||||
"irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d") VT_RST,
|
||||
client->queue, MQ_GET_COUNT(client->queue));
|
||||
} else {
|
||||
//! @bug The function's name suggests this would use osJamMesg rather than osSendMesg, using the
|
||||
//! latter makes this function no different than IrqMgr_SendMesgToClients.
|
||||
|
|
@ -170,19 +169,16 @@ void IrqMgr_HandlePreNMI(IrqMgr* irqMgr) {
|
|||
}
|
||||
|
||||
void IrqMgr_CheckStacks(void) {
|
||||
// "0.5 seconds after PRENMI"
|
||||
PRINTF("irqmgr.c: PRENMIから0.5秒経過\n");
|
||||
PRINTF(T("irqmgr.c: PRENMIから0.5秒経過\n", "irqmgr.c: 0.5 seconds after PRENMI\n"));
|
||||
|
||||
if (StackCheck_Check(NULL) == STACK_STATUS_OK) {
|
||||
// "The stack looks ok"
|
||||
PRINTF("スタックは大丈夫みたいです\n");
|
||||
PRINTF(T("スタックは大丈夫みたいです\n", "The stack looks ok\n"));
|
||||
} else {
|
||||
PRINTF("%c", BEL);
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
// "Stack overflow or dangerous"
|
||||
PRINTF("スタックがオーバーフローしたか危険な状態です\n");
|
||||
// "Increase stack size early or don't consume stack"
|
||||
PRINTF("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n");
|
||||
PRINTF(T("スタックがオーバーフローしたか危険な状態です\n", "Stack overflow or dangerous\n"));
|
||||
PRINTF(T("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n",
|
||||
"Increase stack size early or don't consume stack\n"));
|
||||
PRINTF(VT_RST);
|
||||
}
|
||||
}
|
||||
|
|
@ -207,8 +203,7 @@ void IrqMgr_HandlePreNMI480(IrqMgr* irqMgr) {
|
|||
|
||||
result = osAfterPreNMI();
|
||||
if (result != 0) {
|
||||
// "osAfterPreNMI returned %d !?"
|
||||
PRINTF("osAfterPreNMIが %d を返しました！？\n", result);
|
||||
PRINTF(T("osAfterPreNMIが %d を返しました！？\n", "osAfterPreNMI returned %d !?\n"), result);
|
||||
// osAfterPreNMI failed, try again in 1ms
|
||||
//! @bug setting the same timer for a second time without letting the first one complete breaks
|
||||
//! the timer linked list
|
||||
|
|
@ -243,8 +238,7 @@ void IrqMgr_ThreadEntry(void* arg) {
|
|||
IrqMgr* irqMgr = (IrqMgr*)arg;
|
||||
u8 exit;
|
||||
|
||||
// "Start IRQ manager thread execution"
|
||||
PRINTF("ＩＲＱマネージャスレッド実行開始\n");
|
||||
PRINTF(T("ＩＲＱマネージャスレッド実行開始\n", "Start IRQ manager thread execution\n"));
|
||||
exit = false;
|
||||
|
||||
while (!exit) {
|
||||
|
|
@ -256,42 +250,38 @@ void IrqMgr_ThreadEntry(void* arg) {
|
|||
|
||||
case IRQ_PRENMI_MSG:
|
||||
PRINTF("PRE_NMI_MSG\n");
|
||||
// "Scheduler: Receives PRE_NMI message"
|
||||
PRINTF("スケジューラ：PRE_NMIメッセージを受信\n");
|
||||
PRINTF(T("スケジューラ：PRE_NMIメッセージを受信\n", "Scheduler: Receives PRE_NMI message\n"));
|
||||
IrqMgr_HandlePreNMI(irqMgr);
|
||||
break;
|
||||
|
||||
case IRQ_PRENMI450_MSG:
|
||||
PRINTF("PRENMI450_MSG\n");
|
||||
// "Scheduler: Receives PRENMI450 message"
|
||||
PRINTF("スケジューラ：PRENMI450メッセージを受信\n");
|
||||
PRINTF(T("スケジューラ：PRENMI450メッセージを受信\n", "Scheduler: Receives PRENMI450 message\n"));
|
||||
IrqMgr_HandlePreNMI450(irqMgr);
|
||||
break;
|
||||
|
||||
case IRQ_PRENMI480_MSG:
|
||||
PRINTF("PRENMI480_MSG\n");
|
||||
// "Scheduler: Receives PRENMI480 message"
|
||||
PRINTF("スケジューラ：PRENMI480メッセージを受信\n");
|
||||
PRINTF(T("スケジューラ：PRENMI480メッセージを受信\n", "Scheduler: Receives PRENMI480 message\n"));
|
||||
IrqMgr_HandlePreNMI480(irqMgr);
|
||||
break;
|
||||
|
||||
case IRQ_PRENMI500_MSG:
|
||||
PRINTF("PRENMI500_MSG\n");
|
||||
// "Scheduler: Receives PRENMI500 message"
|
||||
PRINTF("スケジューラ：PRENMI500メッセージを受信\n");
|
||||
PRINTF(T("スケジューラ：PRENMI500メッセージを受信\n", "Scheduler: Receives PRENMI500 message\n"));
|
||||
IrqMgr_HandlePreNMI500(irqMgr);
|
||||
exit = true;
|
||||
break;
|
||||
|
||||
default:
|
||||
// "Unexpected message received"
|
||||
PRINTF("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", msg);
|
||||
PRINTF(T("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n",
|
||||
"irqmgr.c: Unexpected message received (%08x)\n"),
|
||||
msg);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// "End of IRQ manager thread execution"
|
||||
PRINTF("ＩＲＱマネージャスレッド実行終了\n");
|
||||
PRINTF(T("ＩＲＱマネージャスレッド実行終了\n", "End of IRQ manager thread execution\n"));
|
||||
}
|
||||
|
||||
void IrqMgr_Init(IrqMgr* irqMgr, void* stack, OSPri pri, u8 retraceCount) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue