header fixing

include/dolphin/OS/OSCache.h

@@ -0,0 +1,30 @@
+#ifndef OS_CACHE_H
+#define OS_CACHE_H
+#include "types.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+asm void DCEnable(void);
+asm void DCInvalidateRange(void*, u32);
+asm void DCFlushRange(void*, u32);
+asm void DCStoreRange(void*, u32);
+asm void DCFlushRangeNoSync(void*, u32);
+asm void DCStoreRangeNoSync(void*, u32);
+asm void DCZeroRange(void*, u32);
+asm void DCTouchRange(void*, u32 len);
+asm void ICInvalidateRange(void*, u32);
+asm void ICFlashInvalidate(void);
+asm void ICEnable(void);
+asm void LCDisable(void);
+
+//void L2GlobalInvalidate(void);
+
+//void DMAErrorHandler(u8, struct OSContext*, u32, u32, ...);
+
+//void __OSCacheInit(void);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

include/dolphin/OS/OSContext.h

@@ -28,14 +28,14 @@ OSContext* OS_CURRENT_CONTEXT_PHYS : 0x800000C0;
 OSContext* OS_CURRENT_CONTEXT : 0x800000D4;
 OSContext* OS_CURRENT_FPU_CONTEXT : 0x800000D8;
 
-asm void OSSaveFPUContext(OSContext*);
-asm void OSSetCurrentContext(OSContext*);
+void OSSaveFPUContext(OSContext*);
+void OSSetCurrentContext(OSContext*);
 OSContext* OSGetCurrentContext(void);
-asm BOOL OSSaveContext(OSContext*);
-asm void OSLoadContext(OSContext*);
-asm void* OSGetStackPointer(void);
+BOOL OSSaveContext(OSContext*);
+void OSLoadContext(OSContext*);
+void* OSGetStackPointer(void);
 void OSClearContext(OSContext*);
-asm void OSInitContext(register OSContext* ctx, register u32 srr, register sp);
+void OSInitContext(register OSContext*, register u32 srr, register u32 sp);
 void OSDumpContext(const OSContext*);
 
 void __OSContextInit(void);

include/dolphin/OS/os.h

@@ -2,7 +2,7 @@
 #define _DOLPHIN_OS
 
 #include "types.h"
-#include "dolphin/OSContext.h"
+#include "dolphin/OS/OSContext.h"
 #ifdef __cplusplus
 extern "C" {
 #endif

include/dolphin/OSCache.h

@@ -1,31 +0,0 @@
-#ifndef OS_CACHE_H
-#define OS_CACHE_H
-#include "types.h"
-#include "dolphin/OSContext.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-asm void DCEnable(void);
-asm void DCInvalidateRange(void* buf, u32 len);
-asm void DCFlushRange(void* buf, u32 len);
-asm void DCStoreRange(void* buf, u32 len);
-asm void DCFlushRangeNoSync(void* buf, u32 len);
-asm void DCStoreRangeNoSync(void* buf, u32 len);
-asm void DCZeroRange(void* buf, u32 len);
-asm void DCTouchRange(void* buf, u32 len);
-asm void ICInvalidateRange(void* buf, u32 len);
-asm void ICFlashInvalidate(void);
-asm void ICEnable(void);
-asm void LCDisable(void);
-
-void L2GlobalInvalidate(void);
-
-void DMAErrorHandler(u8, OSContext*, u32, u32, ...);
-
-void __OSCacheInit(void);
-
-#ifdef __cplusplus
-}
-#endif
-#endif

include/dolphin/dsp/dsp.h

@@ -0,0 +1,16 @@
+#ifndef DSP_H
+#define DSP_H
+
+#include "types.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif
+
+extern volatile u16 __DSPRegs[] : 0XCC005000;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

include/libforest/batconfig.h

@@ -2,8 +2,8 @@
 #define BATCONFIG_H
 
 #include "types.h"
-#include "dolphin/OSMemory.h"
-#include "dolphin/os.h"
+#include "dolphin/OS/OSMemory.h"
+#include "dolphin/OS/os.h"
 
 asm void Config24MB();
 asm void Config48MB();

include/libforest/fault.h

@@ -1,7 +1,7 @@
 #ifndef FAULT_H
 #define FAULT_H
 #include "types.h"
-#include "dolphin/os.h"
+#include "dolphin/OS/os.h"
 #include "libultra/libultra.h"
 
 

include/libultra/libultra.h

@@ -1,8 +1,8 @@
 #ifndef LIBULTRA_H
 #define LIBULTRA_H
 #include "types.h"
-#include "dolphin/OSTime.h"
-#include "dolphin/OSCache.h"
+#include "dolphin/OS/OSTime.h"
+#include "dolphin/OS/OSCache.h"
 int bcmp (void *v1, void *v2, u32 size);
 void bcopy(void *dst, void *src, size_t n);
 void bzero(void *ptr, size_t size);

include/zurumode.h

@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#include "dolphin/os.h"
+#include "dolphin/OS/os.h"
 #include "libultra/libultra.h"
 #include "JSystem/JUT/JUTAssertion.h"
 #include "JSystem/JUT/JUTDbPrint.h"