From 10b09e62c109c14cad6b9a397f40c920650a5e3e Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 28 Sep 2021 10:10:57 +0200 Subject: [PATCH] Revert "Remove `ASCII_TO_U32`, use `'IS64'`" This reverts commit c801337dde9fe5e8b7a7ecf85ad3629bf5b87aaf. --- src/boot/is_debug.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index aed0a35a27..13ce544b36 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -3,12 +3,13 @@ OSPiHandle* sISVHandle; // official name : is_Handle #define gISVDbgPrnAdrs ((ISVDbg*)0xB3FF0000) +#define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) void isPrintfInit(void) { sISVHandle = osCartRomInit(); osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, 0); osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->get, 0); - osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, 'IS64'); + osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, ASCII_TO_U32('I', 'S', '6', '4')); } void osSyncPrintfUnused(const char* fmt, ...) { @@ -46,7 +47,7 @@ void* is_proutSyncPrintf(void* arg, const char* str, u32 count) { s32 end; osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, &data); - if (data != 'IS64') { + if (data != ASCII_TO_U32('I', 'S', '6', '4')) { return 1; } osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->get, &data);