More work

diff --git a/include/common.h b/include/common.h
index df7e5695a9d4fd3b5f87e49c7655d7057114a1be..c8a46a529829703b431e52efbb240e2b0160568c 100644 (file)
--- a/include/common.h
+++ b/include/common.h
@@ -1,58 +1,30 @@
 #ifndef __COMMON_H
 #define __COMMON_H
 
-#include "std/types.h"
-#include "std/draw.h"
-#include "std/fs.h"
-#include "std/memory.h"
-#include "std/abort.h"
-#include "std/unused.h"
+#include <std/unused.h>
+#include <std/abort.h>
 
-#include "firm/fcram.h"
-#include "firm/headers.h"
+#include <std/types.h>
 
-#include "patch_format.h"
-#include "config.h"
-#include "input.h"
-#include "patcher.h"
+#include <patch_format.h>
 
-#endif
+#include <std/memory.h>
+#include <std/fs.h>
+#include <std/draw.h>
+
+#include <firm/headers.h>
+#include <firm/fcram.h>
+#include <firm/decryptor.h>
+#include <firm/firm.h>
 
-#include 
-<patch/emunand.h>
-#include 
-<patch/patch_file.h>
-#include 
-<std/memory.h>
-#include 
-<std/draw.h>
-#include 
-<std/abort.h>
-#include 
-<std/types.h>
-#include 
-<std/fs.h>
-#include 
-<std/unused.h>
-#include 
-<firm/decryptor.h>
-#include 
-<firm/headers.h>
-#include 
-<firm/firm.h>
-#include 
-<firm/fcram.h>
-#include 
-<screeninit.h>
-#include 
-<interrupt.h>
-#include 
-<config.h>
-#include 
-<input.h>
-#include 
-<interp.h>
-#include 
-<patch_format.h>
-#include <common.h>
+#include <screeninit.h>
+#include <interrupt.h>
+#include <config.h>
+#include <input.h>
+#include <interp.h>
 #include <patcher.h>
+
+#include <patch/patch_file.h>
+#include <patch/emunand.h>
+
+#endif

diff --git a/include/firm/fcram.h b/include/firm/fcram.h
index 7413a87bcc299a2d729e30d87e1326db8d8df2f2..81da640f3415e07820ab465a421c850ea5a5fd99 100644 (file)
--- a/include/firm/fcram.h
+++ b/include/firm/fcram.h
@@ -7,8 +7,6 @@
 #include <stdint.h>
 #include <stddef.h>
 
-#include "../std/unused.h"
-
 extern void *fcram_temp;
 
 // Space between most of the locations

diff --git a/include/firm/firm.h b/include/firm/firm.h
index 3dcc257d7422d79e2aa30968747337edd6b49aac..d6259b9d68b7bf504a4fc0c8baa5a3bb2861f8a6 100644 (file)
--- a/include/firm/firm.h
+++ b/include/firm/firm.h
@@ -1,7 +1,6 @@
 #ifndef __FIRM_H
 
 #include <stdint.h>
-#include "headers.h"
 
 enum consoles
 {

diff --git a/include/interp.h b/include/interp.h
index 0aa7c75ae46003925184b56b6d3bd38c74ee4d24..26c2236ab97a7cf8549de81aad628657cc889f47 100644 (file)
--- a/include/interp.h
+++ b/include/interp.h
@@ -1,7 +1,7 @@
 #ifndef __INTERP_H
 #define __INTERP_H
 
-uint8_t *execb(char *filename, int cache);
-int exec_bytecode(uint8_t *bytecode, uint32_t len, int debug);
+int execb(char *filename, int build_cache);
+int exec_bytecode(uint8_t *bytecode, uint32_t len, uint8_t* stack, uint32_t stack_size, uint16_t ver, int debug);
 
 #endif

diff --git a/include/patch/patch_file.h b/include/patch/patch_file.h
index 0b04b97dd6e0e69cee7f7d256d4d59e06379ae51..152ad877c882de0ebbc95759a7af2acc9ecae1b7 100644 (file)
--- a/include/patch/patch_file.h
+++ b/include/patch/patch_file.h
@@ -4,14 +4,6 @@
 #include <stdint.h>
 
 // Build patch into CFW instead of as module.
-#include "../std/unused.h"
-#include "../std/memory.h"
-#include "../firm/firm.h"
-#include "../firm/fcram.h"
-#include "../config.h"
-#include "../common.h"
-#include "../interp.h"
-
 #define PATCH(name) int patch_##name()
 
 #endif

diff --git a/include/std/draw.h b/include/std/draw.h
index 28b7ef9aaf8aac91e2b506f505799c8e5747b75a..dbc88a645275ea6f1e54009d5b3e56e3c51f6174 100644 (file)
--- a/include/std/draw.h
+++ b/include/std/draw.h
@@ -25,8 +25,6 @@ enum screen
     screen_bottom
 };
 
-#include "unused.h"
-
 _UNUSED static struct framebuffers
 {
     uint8_t *top_left;

diff --git a/include/std/fs.h b/include/std/fs.h
index b3cdf03466aefe190e234b93eacfcac67413a034..941fc1332fc3268229f5c76f6bcbf43a5e2b9ed2 100644 (file)
--- a/include/std/fs.h
+++ b/include/std/fs.h
@@ -1,8 +1,6 @@
 #ifndef __STD_FS_H
 #define __STD_FS_H
 
-#include "types.h"
-#include "memory.h"
 #include <ctr9/io.h>
 
 #define MAX_FILES_OPEN 64