Various exception/assert files

include/egg/util/eggException.h

@@ -37,7 +37,7 @@ public:
     static void SetPreExceptionCallback(void (*cb)());
     static void SetCallbackMode(bool);
     static void SetCallbackArgs(void *);
-    nw4r::db::ConsoleHandle GetConsoleHandle();
+    static nw4r::db::ConsoleHandle GetConsoleHandle();
 };
 
 } // namespace EGG

include/m/m_pad.h

@@ -24,6 +24,7 @@ enum Button {
     BUTTON_MINUS = 0x1000,
     BUTTON_Z = 0x2000,
     BUTTON_C = 0x4000,
+    BUTTON_HOME = 0x8000,
 };
 
 inline EGG::CoreController *getCore(const int i) {

include/rvl/AI/ai.h

@@ -18,6 +18,7 @@ typedef enum {
 AIDMACallback AIRegisterDMACallback(AIDMACallback callback);
 void AIInitDMA(void *buffer, u32 length);
 void AIStartDMA(void);
+void AIStopDMA(void);
 u32 AIGetDMABytesLeft(void);
 void AISetDSPSampleRate(u32 rate);
 u32 AIGetDSPSampleRate(void);

include/rvl/OS/OSError.h

@@ -38,7 +38,8 @@ typedef enum {
     OS_ERR_MAX
 } OSErrorType;
 
-typedef void (*OSErrorHandler)(u16 error, OSContext *ctx, u32 dsisr, u32 dar);
+typedef u16 OSError;
+typedef void (*OSErrorHandler)(OSError error, OSContext* context, ...);
 
 extern OSErrorHandler __OSErrorTable[OS_ERR_MAX];
 extern u32 __OSFpscrEnableBits;

include/s/README.txt

@@ -30,3 +30,7 @@ Implemented by SS based on NSMBW symbols. Probably missing some parts, sync with
 ## s_FPhase
 
 SS-only. Symbols/names completely made up.
+
+## s_Assert, s_Print
+
+SS-only. Symbols/names completely made up.

include/s/s_Assert.h

@@ -0,0 +1,13 @@
+#ifndef S_ASSERT_H
+#define S_ASSERT_H
+
+namespace sAssert {
+
+typedef void (*AssertCallback)(void *);
+
+void setAssertCallback(AssertCallback cb);
+void assert();
+
+} // namespace sAssert
+
+#endif

include/s/s_Crc.h

@@ -5,7 +5,7 @@
 
 namespace sCrc {
 
-u32 calcCRC(const void *ptr, u32 size);
+u32 calcCRC32(const void *ptr, u32 size);
 
 } // namespace sCrc
 

include/s/s_Print.h

@@ -0,0 +1,10 @@
+#ifndef S_PRINT_H
+#define S_PRINT_H
+
+namespace sLib {
+
+void printf(const char *msg, ...);
+
+} // namespace sLib
+
+#endif

include/toBeSorted/d_exception.h

@@ -0,0 +1,8 @@
+#ifndef D_EXCEPTION_H
+#define D_EXCEPTION_H
+
+#include "egg/core/eggHeap.h"
+
+void exceptionCreate(EGG::Heap *heap);
+
+#endif

include/toBeSorted/revision_info.h

@@ -0,0 +1,8 @@
+#ifndef TOBESORTED_REVISION_INFO_H
+#define TOBESORTED_REVISION_INFO_H
+
+const char *getUrlInfo();
+const char *getRevisionInfo();
+const char *getCopydate();
+
+#endif