From c801337dde9fe5e8b7a7ecf85ad3629bf5b87aaf Mon Sep 17 00:00:00 2001 From: Dragorn421 Date: Tue, 21 Sep 2021 10:22:31 +0200 Subject: [PATCH] Remove `ASCII_TO_U32`, use `'IS64'` --- src/boot/is_debug.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index 63d1221c32..5441c02795 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -3,13 +3,12 @@ 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, ASCII_TO_U32('I', 'S', '6', '4')); + osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, 'IS64'); } void osSyncPrintfUnused(const char* fmt, ...) { @@ -47,7 +46,7 @@ void* is_proutSyncPrintf(void* arg, const char* str, u32 count) { s32 end; osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, &data); - if (data != ASCII_TO_U32('I', 'S', '6', '4')) { + if (data != 'IS64') { return 1; } osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->get, &data);