m_dvd work

include/egg/core/eggDecomp.h

@@ -70,7 +70,7 @@ public:
 private:
     // NON-OFFICIAL
     struct SZSCompContext {
-        u8 _[0x18];
+        u8 _[0x14];
         /* 80494e00 */ static u32 getUncompressedSize(const void *src);
         /* 80494e30 */ void init(u32 maxCompSize);
         /* 80494e60 */ static int readSzsHeader(/* unk params*/);

include/egg/core/eggDvdFile.h

@@ -32,8 +32,8 @@ public:
     /* vt 0x0C | 80494450 */ virtual bool open(const char *path);
     /* vt 0x10 | 804944b0 */ virtual void close();
     /* vt 0x14 | 80494510 */ virtual s32 readData(void *buffer, s32 length, s32 offset);
-    /* vt 0x18 | 804945e0 */ virtual s32 writeData(void *buffer, s32 length, s32 offset);
-    /* vt 0x1C | 80494670 */ virtual u32 getFileSize();
+    /* vt 0x18 | 804945e0 */ virtual s32 writeData(const void *buffer, s32 length, s32 offset);
+    /* vt 0x1C | 80494670 */ virtual u32 getFileSize() const;
     /* vt 0x20 | 804943d0 */ virtual bool open(s32 entryNum);
     /* vt 0x24 | 804944a0 */ virtual bool open(const char *path, void *);
 

include/m/m_dvd.h

@@ -0,0 +1,190 @@
+#ifndef M_DVD_H
+#define M_DVD_H
+
+#include <egg/core/eggHeap.h>
+#include <egg/core/eggThread.h>
+#include <m/m_heap.h>
+
+// TODO these are scattered
+int findPathWithCompressedExtension(const char *name, u8 *outType);
+int ConvertPathToEntrynum(const char *path, u8 *outType);
+
+// TODO onComplete -> doClear?
+
+namespace mDvd {
+
+extern void *somePtr;
+
+class TUncompressInfo_Base_c {
+public:
+    TUncompressInfo_Base_c(u8 type, const char *extension) : mType(type), mExtension(extension) {}
+    virtual ~TUncompressInfo_Base_c() {}
+    virtual EGG::StreamDecomp *Construct() const {
+        return nullptr;
+    }
+    virtual void Destruct() const {}
+
+    u8 mType;
+    const char *mExtension;
+};
+
+template <typename T>
+class TUncompressInfo_c : public TUncompressInfo_Base_c {
+public:
+    TUncompressInfo_c(u8 type, const char *extension) : TUncompressInfo_Base_c(type, extension) {}
+    virtual T *Construct() const {
+        return new (somePtr) T();
+    }
+    virtual void Destruct() const {}
+};
+
+class MyThread_c;
+
+TUncompressInfo_Base_c *findUncompressInfo(u8 type);
+
+void create(int priority, EGG::Heap *commandHeap, EGG::Heap *archiveHeap, EGG::Heap *threadHeap);
+void *loadToMainRAM(u32 entryNum, char *dst, EGG::Heap *heap, EGG::DvdRipper::EAllocDirection allocDir, u32 offset, u32 *p6, u32 *p7,
+        u32 decompressorType);
+
+u32 IsExistPath(const char *path);
+
+OSThread *getOSThread();
+EGG::Heap *getArchiveHeap();
+} // namespace mDvd
+
+class mDvd_command_c {
+public:
+    mDvd_command_c();
+    virtual ~mDvd_command_c();
+
+    virtual u32 execute() = 0;
+    virtual void onComplete();
+
+    void doClear();
+    void done();
+    void waitDone();
+    void waitUntilDone();
+    static void destroy(mDvd_command_c **cmd);
+
+    void *operator new(size_t size);
+    void operator delete(void *ptr);
+
+    mDvd_command_c *mNext;
+    u8 mStatus;
+    u8 mMountDirection;
+    u8 mCompressionType;
+};
+
+typedef void *(*dvdReadCallback)(void *);
+
+class mDvdCommandReadCallback_c : public mDvd_command_c {
+public:
+    mDvdCommandReadCallback_c(dvdReadCallback cb, void *cbData);
+    virtual ~mDvdCommandReadCallback_c();
+    virtual u32 execute() override;
+
+    static mDvdCommandReadCallback_c *create(dvdReadCallback cb, void *cbData);
+
+    dvdReadCallback mCallback;
+    void *mCallbackData;
+    void *mDataPtr;
+};
+
+class mDvd_mountMemArchive_c : public mDvd_command_c {
+public:
+    mDvd_mountMemArchive_c(int mountDirection);
+    virtual ~mDvd_mountMemArchive_c();
+    virtual u32 execute();
+    virtual void onComplete();
+
+    static mDvd_mountMemArchive_c *create(const char *path, u8 mountDirection, EGG::Heap *heap);
+    void *getArcBinary();
+
+    int mEntryNum;
+    EGG::Archive *mDataPtr;
+    EGG::Heap *mHeap;
+    u32 field_0x18;
+};
+
+class mDvd_toMainRam_base_c : public mDvd_command_c {
+public:
+    mDvd_toMainRam_base_c(int mountDirection);
+    virtual ~mDvd_toMainRam_base_c();
+    virtual u32 execute() = 0;
+
+    void *mDataPtr;
+    int field_0x10;
+    u32 field_0x14;
+    EGG::Heap *mHeap;
+};
+
+class mDvd_toMainRam_arc_c : public mDvd_toMainRam_base_c {
+public:
+    mDvd_toMainRam_arc_c(EGG::Archive *arc, int entryNum, int mountDirection);
+    virtual ~mDvd_toMainRam_arc_c();
+    virtual u32 execute();
+
+    static mDvd_toMainRam_arc_c *makeRequest(EGG::Archive *arc, int entryNum, int mountDirection, EGG::Heap *heap);
+    static mDvd_toMainRam_arc_c *create(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap);
+
+    EGG::Archive *mArcPtr;
+    int mEntryNum;
+};
+
+class mDvd_toMainRam_normal_c : public mDvd_toMainRam_base_c {
+public:
+    mDvd_toMainRam_normal_c(int mountDirection);
+    ~mDvd_toMainRam_normal_c();
+    virtual u32 execute();
+    virtual void onComplete();
+
+    static mDvd_toMainRam_normal_c *create(const char *path, int mountDirection, EGG::Heap *heap);
+    static void create2(mDvd_toMainRam_normal_c **cmd, const char *path, int mountDirection, EGG::Heap *heap);
+
+    u8 mCompressionType2;
+    int mEntryNum;
+};
+
+class mDvd_param_c {
+public:
+    mDvd_param_c();
+
+    OSMutex mMutex;
+    mDvd_command_c *mFirstRequest;
+    mDvd_command_c *mLastRequest;
+    OSThreadQueue mThreadQueue1;
+    OSThreadQueue mThreadQueue2;
+
+    void kick();
+    void waitForKick();
+
+    mDvd_command_c *getFirstCommand();
+    void addCommand(mDvd_command_c *cmd);
+    void removeCommand(mDvd_command_c *cmd);
+    static u32 executeCB(mDvd_command_c **cmd);
+    void mainLoop();
+
+    static mDvd_param_c *mInstance;
+};
+
+namespace mDvd {
+
+class MyThread_c : EGG::Thread {
+public:
+    MyThread_c(int priority, EGG::Heap *heap);
+
+    virtual void *run() override;
+
+    OSThread *getMyOsThread() {
+        return mOSThread;
+    }
+
+    void setThreadHeap(EGG::Heap *heap) {
+        setThreadCurrentHeap(heap);
+    }
+
+    static void *run(mDvd_param_c *dvd);
+};
+} // namespace mDvd
+
+#endif