Merge remote-tracking branch 'upstream/master' into d_a_do

5 files changed, 17 insertions, 5 deletions

diff --git a/include/dolphin/ar/arq.h b/include/dolphin/ar/arq.h
index b34cf555a1..083c118a4a 100644
--- a/include/dolphin/ar/arq.h
+++ b/include/dolphin/ar/arq.h
@@ -7,8 +7,20 @@
 extern "C" {
 #endif
 
+#define ARQ_CHUNK_SIZE_DEFAULT 4096
+
 typedef void (*ARQCallback)(u32 request_address);
 
+typedef enum _ARamType {
+    ARAM_DIR_MRAM_TO_ARAM,
+    ARAM_DIR_ARAM_TO_MRAM,
+} ARamType;
+
+typedef enum _ArqPriotity {
+    ARQ_PRIORITY_LOW,
+    ARQ_PRIORITY_HIGH,
+} ArqPriotity;
+
 typedef struct ARQRequest {
     struct ARQRequest* next;
     u32 owner;
diff --git a/include/dolphin/card/CARDPriv.h b/include/dolphin/card/CARDPriv.h
index 6d6f3da480..2e6df14132 100644
--- a/include/dolphin/card/CARDPriv.h
+++ b/include/dolphin/card/CARDPriv.h
@@ -117,7 +117,7 @@ void __CARDTxHandler(s32 chan, OSContext* context);
 void __CARDUnlockedHandler(s32 chan, OSContext* context);
 s32 __CARDEnableInterrupt(s32 chan, BOOL enable);
 s32 __CARDReadStatus(s32 chan, u8* status);
-void __CARDReadVendorID();
+s32 __CARDReadVendorID(s32 chan, u16* vendorId);
 s32 __CARDClearStatus(s32 chan);
 s32 __CARDStart(s32 chan, CARDCallback txCallback, CARDCallback exiCallback);
 s32 __CARDReadSegment(s32 chan, CARDCallback callback);
diff --git a/include/dolphin/dvd/dvd.h b/include/dolphin/dvd/dvd.h
index 5253960ac2..4674992277 100644
--- a/include/dolphin/dvd/dvd.h
+++ b/include/dolphin/dvd/dvd.h
@@ -7,8 +7,6 @@
 extern "C" {
 #endif
 
-vu32 __DIRegs[16] : 0xCC006000;
-
 typedef enum DVDState {
     DVD_STATE_END = 0x0,
     DVD_STATE_BUSY = 0x1,
@@ -50,7 +48,6 @@ struct DVDFileInfo;
 struct DVDCommandBlock;
 typedef void (*DVDCBCallback)(s32 result, struct DVDCommandBlock* block);
 typedef void (*DVDCallback)(s32 result, struct DVDFileInfo* info);
-typedef void (*DVDLowCallback)(u32 intType);
 
 typedef struct DVDCommandBlock {
     /* 0x00 */ struct DVDCommandBlock* next;
diff --git a/include/dolphin/dvd/dvdlow.h b/include/dolphin/dvd/dvdlow.h
index c6a28eeaa1..a7645d901c 100644
--- a/include/dolphin/dvd/dvdlow.h
+++ b/include/dolphin/dvd/dvdlow.h
@@ -3,4 +3,7 @@
 
 #include "dolphin/types.h"
 
+typedef void (*DVDLowCallback)(u32 intType);
+vu32 __DIRegs[16] : 0xCC006000;
+
 #endif /* DVDLOW_H */
diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h
index 2d91a6ad0c..cee76aa0db 100644
--- a/include/dolphin/os/OS.h
+++ b/include/dolphin/os/OS.h
@@ -131,7 +131,7 @@ void __OSEVEnd();
 static void OSDefaultExceptionHandler(__OSException exception, OSContext* context);
 void __OSPSInit(void);
 u32 __OSGetDIConfig(void);
-void OSRegisterVersion(char* version);
+void OSRegisterVersion(const char* version);
 void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32);
 
 inline s16 __OSf32tos16(register f32 inF) {