Merge branch 'zeldaret:master' into master

3 files changed, 52 insertions, 1 deletions

diff --git a/include/dolphin/dvd/dvd.h b/include/dolphin/dvd/dvd.h
index 4674992277..1baab94a11 100644
--- a/include/dolphin/dvd/dvd.h
+++ b/include/dolphin/dvd/dvd.h
@@ -22,6 +22,14 @@ typedef enum DVDState {
     DVD_STATE_FATAL_ERROR = -1,
 } DVDState;
 
+
+typedef enum DVDResult {
+    DVD_RESULT_GOOD = 0,
+    DVD_RESULT_FATAL_ERROR = -1,
+    DVD_RESULT_IGNORED = -2,
+    DVD_RESULT_CANCELED = -3,
+} DVDResult;
+
 typedef struct DVDDirectory {
     /* 0x0 */ u32 entry_number;
     /* 0x4 */ u32 location;
diff --git a/include/dolphin/exi/EXIBios.h b/include/dolphin/exi/EXIBios.h
index 5e842a2774..71f91dcaff 100644
--- a/include/dolphin/exi/EXIBios.h
+++ b/include/dolphin/exi/EXIBios.h
@@ -9,6 +9,49 @@ extern "C" {
 
 vu32 __EXIRegs[16] : 0xCC006800;
 
+#define EXI_MEMORY_CARD_59 0x00000004
+#define EXI_MEMORY_CARD_123 0x00000008
+#define EXI_MEMORY_CARD_251 0x00000010
+#define EXI_MEMORY_CARD_507 0x00000020
+
+#define EXI_MEMORY_CARD_1019 0x00000040
+#define EXI_MEMORY_CARD_2043 0x00000080
+
+#define EXI_MEMORY_CARD_1019A 0x00000140
+#define EXI_MEMORY_CARD_1019B 0x00000240
+#define EXI_MEMORY_CARD_1019C 0x00000340
+#define EXI_MEMORY_CARD_1019D 0x00000440
+#define EXI_MEMORY_CARD_1019E 0x00000540
+#define EXI_MEMORY_CARD_1019F 0x00000640
+#define EXI_MEMORY_CARD_1019G 0x00000740
+
+#define EXI_MEMORY_CARD_2043A 0x00000180
+#define EXI_MEMORY_CARD_2043B 0x00000280
+#define EXI_MEMORY_CARD_2043C 0x00000380
+#define EXI_MEMORY_CARD_2043D 0x00000480
+#define EXI_MEMORY_CARD_2043E 0x00000580
+#define EXI_MEMORY_CARD_2043F 0x00000680
+#define EXI_MEMORY_CARD_2043G 0x00000780
+
+#define EXI_USB_ADAPTER 0x01010000
+#define EXI_NPDP_GDEV 0x01020000
+
+#define EXI_MODEM 0x02020000
+#define EXI_ETHER 0x04020200
+#define EXI_ETHER_VIEWER 0x04220001
+#define EXI_STREAM_HANGER 0x04130000
+
+#define EXI_MARLIN 0x03010000
+
+#define EXI_IS_VIEWER 0x05070000
+
+#define EXI_FREQ_1M 0
+#define EXI_FREQ_2M 1
+#define EXI_FREQ_4M 2
+#define EXI_FREQ_8M 3
+#define EXI_FREQ_16M 4
+#define EXI_FREQ_32M 5
+
 #define EXI_READ 0
 #define EXI_WRITE 1
 
diff --git a/include/dolphin/os/OSCache.h b/include/dolphin/os/OSCache.h
index e0a1939e79..23885420be 100644
--- a/include/dolphin/os/OSCache.h
+++ b/include/dolphin/os/OSCache.h
@@ -24,7 +24,7 @@ static void LCStoreBlocks(void* destAddr, void* srcAddr, u32 blockNum);
 u32 LCStoreData(void* destAddr, void* srcAddr, u32 nBytes);
 void LCQueueWait(u32 len);
 static void L2GlobalInvalidate(void);
-static void DMAErrorHandler(s32 error, struct OSContext* context);
+static void DMAErrorHandler(u16 error, struct OSContext* context, ...);
 void __OSCacheInit(void);
 
 #ifdef __cplusplus