More dolphin/os matches

include/dolphin/amcstubs/AmcExi2Stubs.h

@@ -0,0 +1,30 @@
+#ifndef AMCEXI2STUBS_H
+#define AMCEXI2STUBS_H
+
+#include "dolphin/os/OS.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef __OSInterruptHandler AmcEXICallback;
+
+typedef enum {
+    AMC_EXI_NO_ERROR = 0,
+    AMC_EXI_UNSELECTED
+} AmcExiError;
+
+void EXI2_Init(vu8**, AmcEXICallback);
+void EXI2_EnableInterrupts(void);
+int EXI2_Poll(void);
+AmcExiError EXI2_ReadN(void*, u32);
+AmcExiError EXI2_WriteN(const void*, u32);
+void EXI2_Reserve(void);
+void EXI2_Unreserve(void);
+BOOL AMC_IsStub(void);
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif /* AMCEXI2STUBS_H */

include/dolphin/db/db.h

@@ -0,0 +1,38 @@
+#ifndef DB_H
+#define DB_H
+
+#include "dolphin/amcstubs/AmcExi2Stubs.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define OS_DBINTERFACE_ADDR 0x00000040
+
+typedef struct DBInterface {
+    /* 0x0 */ u32 bPresent;
+    /* 0x4 */ u32 exceptionMask;
+    /* 0x8 */ void (*ExceptionDestination)(void);
+    /* 0xC */ void* exceptionReturn;
+} DBInterface;
+
+extern DBInterface* __DBInterface;
+
+void DBInit(void);
+void __DBExceptionDestinationAux(void);
+void __DBExceptionDestination(void);
+BOOL __DBIsExceptionMarked(__OSException);
+void DBPrintf(char* format, ...);
+void DBInitComm(vu8**, AmcEXICallback); // possibly not this type, but some similar construction
+void DBInitInterrupts();
+u32 DBQueryData();
+BOOL DBRead(void*, u32);
+BOOL DBWrite(const void*, u32);
+void DBOpen();
+void DBClose();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* DB_H */

include/dolphin/dvd/dvd.h

@@ -1,7 +1,7 @@
 #ifndef DVD_H
 #define DVD_H
 
-#include "dolphin/types.h"
+#include "global.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -84,7 +84,7 @@ typedef struct DVDDriveInfo {
     /* 0x02 */ u16 device_code;
     /* 0x04 */ u32 release_date;
     /* 0x08 */ u8 padding[24];
-} DVDDriveInfo;
+} DVDDriveInfo ALIGN_DECL(32);
 
 typedef struct DVDBB1 {
   u32 appLoaderLength;
@@ -142,9 +142,11 @@ BOOL DVDSetAutoInvalidation(BOOL autoInval);
 void DVDResume(void);
 static BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback);
 s32 DVDCancel(DVDCommandBlock* block);
-
+void __DVDPrepareResetAsync(DVDCBCallback callbac);
 BOOL DVDCompareDiskID(DVDDiskID* id1, DVDDiskID* id2);
 
+DVDCommandBlock* __DVDPopWaitingQueue(void);
+
 #ifdef __cplusplus
 };
 #endif

include/dolphin/os/OS.h

@@ -90,7 +90,7 @@ extern u8 __OSReport_enable;
 
 extern BOOL __OSIsGcam;
 
-extern u32 BOOT_REGION_START : 0x8044babc;
+extern u32 BOOT_REGION_START : 0x812FDFF0;
 extern u32 BOOT_REGION_END : 0x812FDFEC;
 
 void OSReportInit__Fv(void);  // needed for inline asm

include/dolphin/os/OSThread.h

@@ -98,7 +98,7 @@ BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stackBase,
 void OSExitThread(void* exitValue);
 void OSCancelThread(OSThread* thread);
 void OSDetachThread(OSThread* thread);
-BOOL OSJoinThread(OSThread* thread, void**);
+BOOL OSJoinThread(OSThread* thread, void*);
 s32 OSResumeThread(OSThread* thread);
 s32 OSSuspendThread(OSThread* thread);
 void OSSleepThread(OSThreadQueue* queue);