fix remaining funcs

projectPiki · Sep 13, 2023 · e34eb7f · e34eb7f
1 parent 11806f7
commit e34eb7f
Show file tree

Hide file tree

Showing 6 changed files with 109 additions and 359 deletions.
diff --git a/configure.py b/configure.py
@@ -1615,8 +1615,8 @@
             ["sysGCU/THPAudioDecode", True],
             ["sysGCU/THPDraw", True],
             "sysGCU/THPPlayer",
-            "sysGCU/THPRead",
-            "sysGCU/THPVideoDecode",
+            ["sysGCU/THPRead", True],
+            ["sysGCU/THPVideoDecode", True],
             "sysGCU/pikmin2THPPlayer",
             ["sysGCU/captionMgr", True],
             "sysGCU/captionMessage",

diff --git a/docs/recommended_todo.md b/docs/recommended_todo.md
@@ -183,10 +183,10 @@
 | File | Size (bytes) | File | Size (bytes) |
 | ---- | ---- | ---- | ---- |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectSpecialActor.cpp">JSTObjectSpecialActor.cpp</a> | 2289 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/illustratedBookMessage.cpp">illustratedBookMessage.cpp</a> | 2964 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/captionMessage.cpp">captionMessage.cpp</a> | 3528 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageObj.cpp">messageObj.cpp</a> | 4504 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/aramMgr.cpp">aramMgr.cpp</a> | 4920 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/gameflow.cpp">gameflow.cpp</a> | 5333 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageMgr.cpp">messageMgr.cpp</a> | 6825 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/THPVideoDecode.c">THPVideoDecode.c</a> | 6852 |
-| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/THPRead.c">THPRead.c</a> | 7129 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/section.cpp">section.cpp</a> | 7138 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/THPRead.c">THPRead.c</a> | 3382 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/captionMessage.cpp">captionMessage.cpp</a> | 3528 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageObj.cpp">messageObj.cpp</a> | 4504 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/aramMgr.cpp">aramMgr.cpp</a> | 4920 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/gameflow.cpp">gameflow.cpp</a> | 5333 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/THPVideoDecode.c">THPVideoDecode.c</a> | 6105 |
+| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/messageMgr.cpp">messageMgr.cpp</a> | 6825 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/section.cpp">section.cpp</a> | 7138 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/moviePlayerPauseAndDraw.cpp">moviePlayerPauseAndDraw.cpp</a> | 8587 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/screenScene.cpp">screenScene.cpp</a> | 9274 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/JSTObjectParticleActor.cpp">JSTObjectParticleActor.cpp</a> | 11032 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/loadResource.cpp">loadResource.cpp</a> | 11781 |
 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/heapStatus.cpp">heapStatus.cpp</a> | 12405 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/sysGCU/dvdThread.cpp">dvdThread.cpp</a> | 12535 |

diff --git a/include/THP/THPRead.h b/include/THP/THPRead.h
@@ -9,25 +9,17 @@
 extern "C" {
 #endif // ifdef __cplusplus
 
-BOOL CreateReadThread(int);
+BOOL CreateReadThread(OSPriority prio);
 void ReadThreadStart();
 void ReadThreadCancel();
-void Reader(void*);
-OSMessage PopReadedBuffer();
-BOOL PushReadedBuffer(OSMessage*);
-OSMessage PopFreeReadBuffer();
-BOOL PushFreeReadBuffer(OSMessage*);
-OSMessage PopReadedBuffer2();
-BOOL PushReadedBuffer2(OSMessage*);
 
-extern BOOL ReadThreadCreated;
-extern OSMessageQueue FreeReadBufferQueue;
-extern OSMessageQueue ReadedBufferQueue;
-extern OSMessageQueue ReadedBufferQueue2;
-extern THPReadBuffer* FreeReadBufferMessage[10];
-extern THPReadBuffer* ReadedBufferMessage[10];
-extern THPReadBuffer* ReadedBufferMessage2[10];
-extern OSThread ReadThread;
+// TODO: figure out if these returns THPBuffer * instead(DWARF info pls)
+void* PopReadedBuffer();
+void* PopFreeReadBuffer();
+void* PopReadedBuffer2();
+void* PushReadedBuffer(void* buffer);
+void PushFreeReadBuffer(void* buffer);
+void PushReadedBuffer2(void* buffer);
 
 #ifdef __cplusplus
 };

diff --git a/src/sysGCU/Makefile b/src/sysGCU/Makefile
@@ -55,8 +55,8 @@ GC_FILES:=\
 	$(BUILD_DIR)/src/sysGCU/THPAudioDecode.o\
 	$(BUILD_DIR)/src/sysGCU/THPDraw.o\
 	$(BUILD_DIR)/asm/sysGCU/THPPlayer.o\
-	$(BUILD_DIR)/asm/sysGCU/THPRead.o\
-	$(BUILD_DIR)/asm/sysGCU/THPVideoDecode.o\
+	$(BUILD_DIR)/src/sysGCU/THPRead.o\
+	$(BUILD_DIR)/src/sysGCU/THPVideoDecode.o\
 	$(BUILD_DIR)/asm/sysGCU/pikmin2THPPlayer.o\
 	$(BUILD_DIR)/src/sysGCU/captionMgr.o\
 	$(BUILD_DIR)/asm/sysGCU/captionMessage.o\