From 3477aaa1cbe5b7789dde7098e2df752f3b738f3d Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Mon, 24 Apr 2023 21:10:38 -0700 Subject: [PATCH] replace OS_MESSAGE_NON_BLOCKING and OS_MESSAGE_BLOCKING with OS_MESSAGE_NOBLOCK and OS_MESSAGE_BLOCK --- include/JSystem/JKernel/JKRThread.h | 10 +++++----- include/dolphin/os/OS.h | 3 --- libs/JSystem/JFramework/JFWDisplay.cpp | 2 +- libs/JSystem/JKernel/JKRAram.cpp | 2 +- libs/JSystem/JKernel/JKRAramPiece.cpp | 10 +++++----- libs/JSystem/JKernel/JKRAramStream.cpp | 8 ++++---- libs/JSystem/JKernel/JKRDecomp.cpp | 12 ++++++------ libs/JSystem/JKernel/JKRDvdFile.cpp | 2 +- libs/JSystem/JUtility/JUTException.cpp | 2 +- libs/JSystem/JUtility/JUTVideo.cpp | 2 +- src/m_Do/m_Do_dvd_thread.cpp | 4 ++-- 11 files changed, 27 insertions(+), 30 deletions(-) diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h index 9b1d8bf48ce..c4c294dcd54 100644 --- a/include/JSystem/JKernel/JKRThread.h +++ b/include/JSystem/JKernel/JKRThread.h @@ -81,23 +81,23 @@ public: protected: void resume() { OSResumeThread(mThreadRecord); } void sendMessage(OSMessage message) { - OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NOBLOCK); } void sendMessageBlock(OSMessage message) { - OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCKING); + OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK); } OSMessage waitMessage() { OSMessage message; - OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING); + OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_NOBLOCK); return message; } OSMessage waitMessageBlock() { OSMessage message; - OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_BLOCK); return message; } void jamMessageBlock(OSMessage message) { - OSJamMessage(&mMessageQueue, message, OS_MESSAGE_BLOCKING); + OSJamMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK); } private: diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h index 075bc5f2b3a..ec036ea8b87 100644 --- a/include/dolphin/os/OS.h +++ b/include/dolphin/os/OS.h @@ -38,9 +38,6 @@ extern "C" { #define OS_BASE_CACHED (OS_CACHED_REGION_PREFIX << 16) #define OS_BASE_UNCACHED (OS_UNCACHED_REGION_PREFIX << 16) -#define OS_MESSAGE_NON_BLOCKING 0 -#define OS_MESSAGE_BLOCKING 1 - #define OS_CONSOLE_MASK 0xf0000000 #define OS_CONSOLE_RETAIL 0x00000000 #define OS_CONSOLE_DEVELOPMENT 0x10000000 diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 5e977b58e4d..12ff3f2eab2 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -520,7 +520,7 @@ static void waitForTick(u32 param_0, u16 param_1) { OSMessage msg; do { if (!OSReceiveMessage(JUTVideo::getManager()->getMessageQueue(), &msg, - OS_MESSAGE_BLOCKING)) { + OS_MESSAGE_BLOCK)) { msg = NULL; } } while ((int)msg - nextCount > 0); diff --git a/libs/JSystem/JKernel/JKRAram.cpp b/libs/JSystem/JKernel/JKRAram.cpp index 6a2c20f0ad4..3d0f0e70f3f 100644 --- a/libs/JSystem/JKernel/JKRAram.cpp +++ b/libs/JSystem/JKernel/JKRAram.cpp @@ -158,7 +158,7 @@ void* JKRAram::run(void) { JKRAramPiece::Message* message; OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 4); do { - OSReceiveMessage(&sMessageQueue, (OSMessage*)&message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&sMessageQueue, (OSMessage*)&message, OS_MESSAGE_BLOCK); result = message->field_0x00; command = message->command; delete message; diff --git a/libs/JSystem/JKernel/JKRAramPiece.cpp b/libs/JSystem/JKernel/JKRAramPiece.cpp index fb837ae66c8..4be2fc66ae7 100644 --- a/libs/JSystem/JKernel/JKRAramPiece.cpp +++ b/libs/JSystem/JKernel/JKRAramPiece.cpp @@ -57,7 +57,7 @@ JKRAMCommand* JKRAramPiece::orderAsync(int direction, u32 source, u32 destinatio message->field_0x00 = 1; message->command = command; - OSSendMessage(&JKRAram::sMessageQueue, message, OS_MESSAGE_BLOCKING); + OSSendMessage(&JKRAram::sMessageQueue, message, OS_MESSAGE_BLOCK); if (command->mCallback != NULL) { sAramPieceCommandList.append(&command->mPieceLink); } @@ -72,13 +72,13 @@ BOOL JKRAramPiece::sync(JKRAMCommand* command, int is_non_blocking) { lock(); if (is_non_blocking == 0) { - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCK); sAramPieceCommandList.remove(&command->mPieceLink); unlock(); return TRUE; } - BOOL result = OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING); + BOOL result = OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK); if (!result) { unlock(); return FALSE; @@ -134,9 +134,9 @@ void JKRAramPiece::doneDMA(u32 requestAddress) { if (command->mCallback) { (*command->mCallback)(requestAddress); } else if (command->field_0x5C) { - OSSendMessage(command->field_0x5C, command, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(command->field_0x5C, command, OS_MESSAGE_NOBLOCK); } else { - OSSendMessage(&command->mMessageQueue, command, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&command->mMessageQueue, command, OS_MESSAGE_NOBLOCK); } } diff --git a/libs/JSystem/JKernel/JKRAramStream.cpp b/libs/JSystem/JKernel/JKRAramStream.cpp index d9a243a97c7..84487235137 100644 --- a/libs/JSystem/JKernel/JKRAramStream.cpp +++ b/libs/JSystem/JKernel/JKRAramStream.cpp @@ -51,7 +51,7 @@ void* JKRAramStream::run() { for (;;) { OSMessage message; - OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCK); JKRAramStreamCommand* command = (JKRAramStreamCommand*)message; switch (command->mType) { @@ -173,7 +173,7 @@ JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream } OSInitMessageQueue(&command->mMessageQueue, &command->mMessage, 1); - OSSendMessage(&sMessageQueue, command, OS_MESSAGE_BLOCKING); + OSSendMessage(&sMessageQueue, command, OS_MESSAGE_BLOCK); return command; } @@ -182,7 +182,7 @@ JKRAramStreamCommand* JKRAramStream::write_StreamToAram_Async(JSUFileInputStream JKRAramStreamCommand* JKRAramStream::sync(JKRAramStreamCommand* command, BOOL isNonBlocking) { OSMessage message; if (isNonBlocking == 0) { - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCK); if (message == NULL) { command = NULL; return command; @@ -191,7 +191,7 @@ JKRAramStreamCommand* JKRAramStream::sync(JKRAramStreamCommand* command, BOOL is } } else { BOOL receiveResult = - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING); + OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK); if (receiveResult == FALSE) { command = NULL; return command; diff --git a/libs/JSystem/JKernel/JKRDecomp.cpp b/libs/JSystem/JKernel/JKRDecomp.cpp index 12994b94a76..4f1c1a6e8d4 100644 --- a/libs/JSystem/JKernel/JKRDecomp.cpp +++ b/libs/JSystem/JKernel/JKRDecomp.cpp @@ -83,7 +83,7 @@ void* JKRDecomp::run() { OSInitMessageQueue(&sMessageQueue, sMessageBuffer, 8); for (;;) { OSMessage message; - OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&sMessageQueue, &message, OS_MESSAGE_BLOCK); JKRDecompCommand* command = (JKRDecompCommand*)message; decode(command->mSrcBuffer, command->mDstBuffer, command->mSrcLength, command->mDstLength); @@ -101,9 +101,9 @@ void* JKRDecomp::run() { } if (command->field_0x1c) { - OSSendMessage(command->field_0x1c, (OSMessage)1, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(command->field_0x1c, (OSMessage)1, OS_MESSAGE_NOBLOCK); } else { - OSSendMessage(&command->mMessageQueue, (OSMessage)1, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&command->mMessageQueue, (OSMessage)1, OS_MESSAGE_NOBLOCK); } } } @@ -125,7 +125,7 @@ JKRDecompCommand* JKRDecomp::prepareCommand(u8* srcBuffer, u8* dstBuffer, u32 sr /* 802DB8D0-802DB900 2D6210 0030+00 1/1 1/1 0/0 .text sendCommand__9JKRDecompFP16JKRDecompCommand */ void JKRDecomp::sendCommand(JKRDecompCommand* command) { - OSSendMessage(&sMessageQueue, command, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&sMessageQueue, command, OS_MESSAGE_NOBLOCK); } /* 802DB900-802DB934 2D6240 0034+00 1/1 0/0 0/0 .text orderAsync__9JKRDecompFPUcPUcUlUlPFUl_v */ @@ -142,11 +142,11 @@ bool JKRDecomp::sync(JKRDecompCommand* command, int isNonBlocking) { OSMessage message; bool result; if (isNonBlocking == JKRDECOMP_SYNC_BLOCKING) { - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCKING); + OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_BLOCK); result = true; } else { result = - OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NON_BLOCKING) != FALSE; + OSReceiveMessage(&command->mMessageQueue, &message, OS_MESSAGE_NOBLOCK) != FALSE; } return result; diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp index 83356b1ee28..aedca6c4efd 100644 --- a/libs/JSystem/JKernel/JKRDvdFile.cpp +++ b/libs/JSystem/JKernel/JKRDvdFile.cpp @@ -144,7 +144,7 @@ s32 JKRDvdFile::sync(void) { void JKRDvdFile::doneProcess(long id, DVDFileInfo* fileInfo) { // fileInfo->field_0x3c looks like some kind of user pointer? JKRDvdFile* dvdFile = *(JKRDvdFile**)((u8*)fileInfo + 0x3c); - OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)id, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)id, OS_MESSAGE_NOBLOCK); } /* 802D9AF8-802D9B00 2D4438 0008+00 1/0 0/0 0/0 .text getFileSize__10JKRDvdFileCFv */ diff --git a/libs/JSystem/JUtility/JUTException.cpp b/libs/JSystem/JUtility/JUTException.cpp index a8a28998cf0..92f615b636e 100644 --- a/libs/JSystem/JUtility/JUTException.cpp +++ b/libs/JSystem/JUtility/JUTException.cpp @@ -216,7 +216,7 @@ void JUTException::errorHandler(OSError error, OSContext* context, u32 param_3, exCallbackObject.param_3 = param_3; exCallbackObject.param_4 = param_4; - OSSendMessage(&sMessageQueue, &exCallbackObject, OS_MESSAGE_BLOCKING); + OSSendMessage(&sMessageQueue, &exCallbackObject, OS_MESSAGE_BLOCK); OSEnableScheduler(); OSYieldThread(); } diff --git a/libs/JSystem/JUtility/JUTVideo.cpp b/libs/JSystem/JUtility/JUTVideo.cpp index ed802367988..c1ae47ae00f 100644 --- a/libs/JSystem/JUtility/JUTVideo.cpp +++ b/libs/JSystem/JUtility/JUTVideo.cpp @@ -192,7 +192,7 @@ void JUTVideo::postRetraceProc(u32 retrace_count) { } OSMessage message = (OSMessage*)VIGetRetraceCount(); - OSSendMessage(&sManager->mMessageQueue, message, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&sManager->mMessageQueue, message, OS_MESSAGE_NOBLOCK); } /* 802E5198-802E5210 2DFAD8 0078+00 1/1 2/2 0/0 .text diff --git a/src/m_Do/m_Do_dvd_thread.cpp b/src/m_Do/m_Do_dvd_thread.cpp index f7b69c51865..447757da324 100644 --- a/src/m_Do/m_Do_dvd_thread.cpp +++ b/src/m_Do/m_Do_dvd_thread.cpp @@ -68,13 +68,13 @@ mDoDvdThd_param_c::mDoDvdThd_param_c() { /* 8001598C-800159B4 0102CC 0028+00 2/2 0/0 0/0 .text kick__17mDoDvdThd_param_cFv */ void mDoDvdThd_param_c::kick() { - OSSendMessage(&mMessageQueue, NULL, OS_MESSAGE_NON_BLOCKING); + OSSendMessage(&mMessageQueue, NULL, OS_MESSAGE_NOBLOCK); } /* 800159B4-800159DC 0102F4 0028+00 1/1 0/0 0/0 .text waitForKick__17mDoDvdThd_param_cFv */ s32 mDoDvdThd_param_c::waitForKick() { - return OSReceiveMessage(&mMessageQueue, NULL, OS_MESSAGE_BLOCKING); + return OSReceiveMessage(&mMessageQueue, NULL, OS_MESSAGE_BLOCK); } /* 800159DC-800159E4 01031C 0008+00 1/1 0/0 0/0 .text getFirstCommand__17mDoDvdThd_param_cFv */