OS.h and JKRDvdFile (#19)

* OS header

* JKRFile and JKRDvdFile

1 files changed, 115 insertions, 38 deletions

diff --git a/libs/JSystem/JKernel/JKRDvdFile.cpp b/libs/JSystem/JKernel/JKRDvdFile.cpp
index 60826fe35e..ec3d64c16c 100644
--- a/libs/JSystem/JKernel/JKRDvdFile.cpp
+++ b/libs/JSystem/JKernel/JKRDvdFile.cpp
@@ -1,68 +1,145 @@
 #include "JSystem/JKernel/JKRDvdFile/JKRDvdFile.h"
 #include "global.h"
 
-
-asm  JKRDvdFile::JKRDvdFile(void) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9584.s"
+JKRDvdFile::JKRDvdFile() : JKRFile(), mDvdLink(this) {
+    this->initiate();
 }
 
-asm  JKRDvdFile::JKRDvdFile(char const *) {
+#ifdef NONMATCHING
+JKRDvdFile::JKRDvdFile(char const* param_1) : JKRFile(), mDvdLink(this) {
+    this->initiate();
+    bool result   = this->open(param_1);
+    this->mIsOpen = result;
+}
+#else
+asm JKRDvdFile::JKRDvdFile(char const*) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s"
+#include "JSystem/JKernel/JKRDvdFile/asm/func_802D95F8.s"
 }
+#endif
 
-asm  JKRDvdFile::JKRDvdFile(long) {
+#ifdef NONMATHCING
+JKRDvdFile::JKRDvdFile(long param_1) : JKRFile(), mDvdLink(this) {
+    this->initiate();
+    bool result   = this->open(param_1);
+    this->mIsOpen = result;
+}
+#else
+asm JKRDvdFile::JKRDvdFile(long) {
     nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s"
+#include "JSystem/JKernel/JKRDvdFile/asm/func_802D96A0.s"
 }
+#endif
 
-asm  JKRDvdFile::~JKRDvdFile() {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9748.s"
+JKRDvdFile::~JKRDvdFile() {
+    this->close();
 }
 
-asm void JKRDvdFile::initiate(void) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D97E4.s"
+void JKRDvdFile::initiate(void) {
+    this->mDvdFile = this;
+    OSInitMutex(&this->mMutex1);
+    OSInitMutex(&this->mMutex2);
+    OSInitMessageQueue(&this->mQueue2, this->mMessages2, 1);
+    OSInitMessageQueue(&this->mQueue1, this->mMessages1, 1);
+    this->mOSThread  = NULL;
+    this->field_0x50 = 0;
+    this->field_0x58 = 0;
 }
 
-asm bool JKRDvdFile::open(char const *) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9850.s"
+bool JKRDvdFile::open(char const* param_1) {
+    if (!this->mIsOpen) {
+        this->mIsOpen = DVDOpen(param_1, this->mDvdCommandBlock);
+        if (this->mIsOpen) {
+            lbl_8043436C.append(&this->mDvdLink);
+            this->getStatus();
+        }
+    }
+    return this->mIsOpen;
 }
 
-asm bool JKRDvdFile::open(long) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D98C4.s"
+bool JKRDvdFile::open(long param_1) {
+    if (!this->mIsOpen) {
+        this->mIsOpen = DVDFastOpen(param_1, this->mDvdCommandBlock);
+        if (this->mIsOpen) {
+            lbl_8043436C.append(&this->mDvdLink);
+            this->getStatus();
+        }
+    }
+    return this->mIsOpen;
 }
 
-asm void JKRDvdFile::close(void) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9938.s"
+void JKRDvdFile::close() {
+    if (this->mIsOpen) {
+        s32 result = DVDClose(this->mDvdCommandBlock);
+        if (result != 0) {
+            this->mIsOpen = false;
+            lbl_8043436C.remove(&this->mDvdLink);
+        } else {
+            const char* filename = lbl_8039D260;        // "JKRDvdFile.cpp"
+            const char* format   = lbl_8039D260 + 0x0F; // "%s"
+            const char* arg1     = lbl_8039D260 + 0x12; // "cannot close DVD file\n"
+            JUTException_NS_panic_f(filename, 0xd5, format, arg1);
+        }
+    }
 }
 
-asm void JKRDvdFile::readData(void *, long, long) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s"
+#define JUT_ASSERT(CONDITION)
+
+//#include "JSystem/JKernel/JKRDvdFile/asm/func_802D99B4.s"
+s32 JKRDvdFile::readData(void* param_1, long length, long param_3) {
+    JUT_ASSERT((length & 0x1f) == 0);
+
+    OSLockMutex(&this->mMutex1);
+    if (this->mOSThread) {
+        OSUnlockMutex(&this->mMutex1);
+        return -1;
+    }
+
+    this->mOSThread = OSGetCurrentThread();
+
+    s32 result = -1;
+    s32 readAsyncResult =
+        DVDReadAsyncPrio(this->mDvdCommandBlock, param_1, length, param_3, JKRDvdFile::doneProcess, 2);
+    if (readAsyncResult) {
+        result = this->sync();
+    }
+
+    this->mOSThread = NULL;
+    OSUnlockMutex(&this->mMutex1);
+
+    return result;
 }
 
-asm s32 JKRDvdFile::writeData(void const *, long, long) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A68.s"
+s32 JKRDvdFile::writeData(void const*, long, long) {
+    return -1;
 }
 
-asm void JKRDvdFile::sync(void) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9A70.s"
+s32 JKRDvdFile::sync(void) {
+    OSMessage message;
+    OSLockMutex(&this->mMutex1);
+    OSReceiveMessage(&this->mQueue2, &message, 1);
+    this->mOSThread = NULL;
+    OSUnlockMutex(&this->mMutex1);
+    return (int)message;
 }
 
-asm void JKRDvdFile::doneProcess(long, DVDFileInfo *) {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AC4.s"
+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->mQueue2, (OSMessage)id, 0);
 }
 
-asm s32 JKRDvdFile::getFileSize(void) const {
-    nofralloc
-    #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s"
+// #include "JSystem/JKernel/JKRDvdFile/asm/func_802D9AF8.s"
+s32 JKRDvdFile::getFileSize(void) const {
+    return this->mFileSize;
 }
+