summaryrefslogtreecommitdiff
path: root/arm9
diff options
context:
space:
mode:
authorred031000 <rubenru09@aol.com>2020-09-03 18:38:32 +0100
committerred031000 <rubenru09@aol.com>2020-09-03 18:38:50 +0100
commitde5004d18612a49bd6f04c26c81cf9c790c0721b (patch)
treeba5849e6c263a16674d42ee19a288ac14e874fc2 /arm9
parent1b96581aa2aecec27b6f1e523c3611f9bb400caa (diff)
arm7 OS_message
Diffstat (limited to 'arm9')
-rw-r--r--arm9/lib/include/OS_message.h25
-rw-r--r--arm9/lib/src/OS_message.c1
2 files changed, 7 insertions, 19 deletions
diff --git a/arm9/lib/include/OS_message.h b/arm9/lib/include/OS_message.h
index 2dc26d50..b9c570db 100644
--- a/arm9/lib/include/OS_message.h
+++ b/arm9/lib/include/OS_message.h
@@ -1,23 +1,10 @@
-#ifndef POKEDIAMOND_OS_MESSAGE_H
-#define POKEDIAMOND_OS_MESSAGE_H
+#ifndef POKEDIAMOND_ARM9_OS_MESSAGE_H
+#define POKEDIAMOND_ARM9_OS_MESSAGE_H
-#include "nitro/types.h"
#include "OS_thread.h"
-
-typedef void *OSMessage;
-
-typedef struct OSMessageQueue
-{
- OSThreadQueue queueSend;
- OSThreadQueue queueReceive;
- OSMessage *msgArray;
- s32 msgCount;
- s32 firstIndex;
- s32 usedCount;
-} OSMessageQueue;
-
-#define OS_MESSAGE_NOBLOCK 0
-#define OS_MESSAGE_BLOCK 1
+#include "OS_context.h"
+#include "nitro/types.h"
+#include "nitro/OS_message_shared.h"
void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount);
BOOL OS_SendMessage(OSMessageQueue *mq, OSMessage msg, s32 flags);
@@ -25,4 +12,4 @@ BOOL OS_ReceiveMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags);
BOOL OS_JamMessage(OSMessageQueue *mq, OSMessage msg, s32 flags);
BOOL OS_ReadMessage(OSMessageQueue *mq, OSMessage *msg, s32 flags);
-#endif //POKEDIAMOND_OS_MESSAGE_H
+#endif //POKEDIAMOND_ARM9_OS_MESSAGE_H
diff --git a/arm9/lib/src/OS_message.c b/arm9/lib/src/OS_message.c
index 9f7beb8e..3b5c33b0 100644
--- a/arm9/lib/src/OS_message.c
+++ b/arm9/lib/src/OS_message.c
@@ -1,6 +1,7 @@
#include "OS_message.h"
#include "function_target.h"
#include "OS_system.h"
+#include "OS_thread.h"
ARM_FUNC void OS_InitMessageQueue(OSMessageQueue *mq, OSMessage *msgArray, s32 msgCount)
{