Various exception/assert files

10 files changed, 49 insertions, 3 deletions

diff --git a/include/egg/util/eggException.h b/include/egg/util/eggException.h
index 6a2cc957..8fa16b85 100644
--- a/include/egg/util/eggException.h
+++ b/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
diff --git a/include/m/m_pad.h b/include/m/m_pad.h
index 1c0bc9e6..3942e191 100644
--- a/include/m/m_pad.h
+++ b/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) {
diff --git a/include/rvl/AI/ai.h b/include/rvl/AI/ai.h
index 3fe542be..7a5be82d 100644
--- a/include/rvl/AI/ai.h
+++ b/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);
diff --git a/include/rvl/OS/OSError.h b/include/rvl/OS/OSError.h
index 724850a1..0752584d 100644
--- a/include/rvl/OS/OSError.h
+++ b/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;
diff --git a/include/s/README.txt b/include/s/README.txt
index dc469bfe..de767b78 100644
--- a/include/s/README.txt
+++ b/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.
diff --git a/include/s/s_Assert.h b/include/s/s_Assert.h
new file mode 100644
index 00000000..40520854
--- /dev/null
+++ b/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
diff --git a/include/s/s_Crc.h b/include/s/s_Crc.h
index 2e7809a0..ec09ecde 100644
--- a/include/s/s_Crc.h
+++ b/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
 
diff --git a/include/s/s_Print.h b/include/s/s_Print.h
new file mode 100644
index 00000000..75992fd4
--- /dev/null
+++ b/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
diff --git a/include/toBeSorted/d_exception.h b/include/toBeSorted/d_exception.h
new file mode 100644
index 00000000..a46671a9
--- /dev/null
+++ b/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
diff --git a/include/toBeSorted/revision_info.h b/include/toBeSorted/revision_info.h
new file mode 100644
index 00000000..58aa98e1
--- /dev/null
+++ b/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