diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/JSystem/JKernel/JKRThread.h | 10 | ||||
| -rw-r--r-- | include/dolphin/os/OS.h | 3 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h index 9b1d8bf48c..c4c294dcd5 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 075bc5f2b3..ec036ea8b8 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 |