Reorganize library code into libs/ (#3119)

* Reorganize files into libs/{dolphin,JSystem,PowerPC_EABI_Support,revolution,TRK_MINNOW_DOLPHIN} * Update configure.py and project.py for new libs structure * Refactor `#include <dolphin/x.h>` -> `<x.h>` * Remove `__REVOLUTION_SDK__` forwards from dolphin * Fix dolphin/ references in revolution * Wrap `#include <dolphin.h>` in `!__REVOLUTION_SDK__` * Always build TRK against dolphin headers * Resolve revolution SDK header resolution issues
2026-06-12 04:57:06 -04:00 · 2026-03-01 15:35:36 -07:00
parent c9a46bd65b
commit 4df8ccc871
1740 changed files with 583 additions and 825 deletions
@@ -0,0 +1,133 @@
+#include "JSystem/JSystem.h" // IWYU pragma: keep
+
+#include "JSystem/JKernel/JKRDvdFile.h"
+#include "JSystem/JUtility/JUTAssert.h"
+#include "JSystem/JUtility/JUTException.h"
+#include <stdint.h>
+
+JSUList<JKRDvdFile> JKRDvdFile::sDvdList;
+
+JKRDvdFile::JKRDvdFile() : mDvdLink(this) {
+    initiate();
+}
+
+JKRDvdFile::JKRDvdFile(const char* name) : mDvdLink(this) {
+    initiate();
+    mIsAvailable = open(name);
+    // weird code. doesn't match without this, maybe remains from assert or something?
+    if (!mIsAvailable)
+        return;
+    else
+        return;
+}
+
+JKRDvdFile::JKRDvdFile(s32 entryNum) : mDvdLink(this) {
+    initiate();
+    mIsAvailable = open(entryNum);
+    // weird code. doesn't match without this, maybe remains from assert or something?
+    if (!mIsAvailable)
+        return;
+    else
+        return;
+}
+
+JKRDvdFile::~JKRDvdFile() {
+    close();
+}
+
+void JKRDvdFile::initiate(void) {
+    mDvdFile = this;
+    OSInitMutex(&mMutex1);
+    OSInitMutex(&mMutex2);
+    OSInitMessageQueue(&mMessageQueue2, &mMessage2, 1);
+    OSInitMessageQueue(&mMessageQueue1, &mMessage1, 1);
+    mOSThread = NULL;
+    field_0x50 = 0;
+    field_0x58 = 0;
+}
+
+bool JKRDvdFile::open(const char* name) {
+    if (!mIsAvailable) {
+        mIsAvailable = DVDOpen(name, &mFileInfo);
+        if (mIsAvailable) {
+            sDvdList.append(&mDvdLink);
+            getStatus();
+        }
+    }
+    return mIsAvailable;
+}
+
+bool JKRDvdFile::open(s32 entryNum) {
+    if (!mIsAvailable) {
+        mIsAvailable = DVDFastOpen(entryNum, &mFileInfo);
+        if (mIsAvailable) {
+            sDvdList.append(&mDvdLink);
+            getStatus();
+        }
+    }
+    return mIsAvailable;
+}
+
+void JKRDvdFile::close() {
+    if (mIsAvailable) {
+        if (DVDClose(&mFileInfo) != 0) {
+            mIsAvailable = false;
+            sDvdList.remove(&mDvdLink);
+        } else {
+            JUTException::panic(__FILE__, 213, "cannot close DVD file\n");
+        }
+    }
+}
+
+s32 JKRDvdFile::readData(void* param_1, s32 length, s32 param_3) {
+    /* clang-format off */
+    // The assert condition gets stringified as "( length & 0x1f ) == 0", 
+    // with out disabling clang-format the spaces in the condition will  
+    // get removed and the string will be incorrect.
+    JUT_ASSERT(238, ( length & 0x1f ) == 0);
+    /* clang-format on */
+
+    OSLockMutex(&mMutex1);
+    if (mOSThread) {
+        OSUnlockMutex(&mMutex1);
+        return -1;
+    }
+
+    mOSThread = OSGetCurrentThread();
+
+    s32 result = -1;
+    if (DVDReadAsyncPrio(&mFileInfo, param_1, length, param_3, JKRDvdFile::doneProcess, 2)) {
+        result = sync();
+    }
+
+    mOSThread = NULL;
+    OSUnlockMutex(&mMutex1);
+
+    return result;
+}
+
+s32 JKRDvdFile::writeData(void const* param_0, s32 length, s32 param_2) {
+    /* clang-format off */
+    JUT_ASSERT(344, ( length & 0x1f ) == 0);
+    /* clang-format on */
+    return -1;
+}
+
+s32 JKRDvdFile::sync(void) {
+    OSMessage message;
+    OSLockMutex(&mMutex1);
+    OSReceiveMessage(&mMessageQueue2, &message, 1);
+    mOSThread = NULL;
+    OSUnlockMutex(&mMutex1);
+    return (intptr_t)message;
+}
+
+void JKRDvdFile::doneProcess(s32 id, DVDFileInfo* fileInfo) {
+    // fileInfo->field_0x3c looks like some kind of user pointer?
+    JKRDvdFile* dvdFile = *(JKRDvdFile**)((u8*)fileInfo + 0x3c);
+    OSSendMessage(&dvdFile->mMessageQueue2, (OSMessage)(intptr_t)id, OS_MESSAGE_NOBLOCK);
+}
+
+s32 JKRDvdFile::getFileSize(void) const {
+    return mFileInfo.length;
+}