Update include layout.

include/coreinit/debug.h

@@ -0,0 +1,22 @@
+#pragma once
+#include <stdint.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void
+OSConsoleWrite(const char *msg, uint32_t size);
+
+void
+OSReport(const char *fmt, ...);
+
+void
+OSPanic(const char *file, uint32_t line, const char *fmt, ...);
+
+void
+OSFatal(const char *msg);
+
+#ifdef __cplusplus
+}
+#endif

include/coreinit/exit.h

@@ -4,6 +4,9 @@
 extern "C" {
 #endif
 
+void
+exit(int code);
+
 void
 _Exit();
 

include/coreinit_debug.h

@@ -1,12 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void
-OSFatal(const char *msg);
-
-#ifdef __cplusplus
-}
-#endif

include/gx2/state.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum GX2InitAttributes
+{
+	GX2_INIT_END = 0,
+	GX2_INIT_CMD_BUF_BASE = 1,
+	GX2_INIT_CMD_BUF_POOL_SIZE = 2,
+	GX2_INIT_ARGC = 7,
+	GX2_INIT_ARGV = 8,
+};
+
+void
+GX2Init(uint32_t *attributes);
+
+void
+GX2Shutdown();
+
+#ifdef __cplusplus
+}
+#endif

include/gx2_init.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void
-GX2Init();
-
-void
-GX2Shutdown();
-
-#ifdef __cplusplus
-}
-#endif

rpl/libcoreinit/exports.h

@@ -1,2 +1,9 @@
-EXPORT(_Exit);
-EXPORT(OSFatal);
+// coreinit/debug.h
+EXPORT(OSConsoleWrite);
+EXPORT(OSReport);
+EXPORT(OSPanic);
+EXPORT(OSFatal);
+
+// coreinit/exit.h
+EXPORT(exit);
+EXPORT(_Exit);

rpl/libgx2/exports.h

@@ -1,2 +1,3 @@
+// gx2/state.h
 EXPORT(GX2Init);
 EXPORT(GX2Shutdown);

samples/helloworld/src/main.c

@@ -1,8 +1,8 @@
-#include <coreinit_debug.h>
-#include <gx2_init.h>
+#include <coreinit/debug.h>
 
 int main(int argc, char **argv)
 {
+	OSReport("Testing var args %d", argc);
 	OSFatal("my first rpx");
 	return 0;
 }