Merge pull request #31 from jacmet/c-types-header

Make rboot.h self contained
raburton · Jan 31, 2017 · 3b067a8 · 3b067a8
2 parents 78690c7 + 290d932
commit 3b067a8
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 26 deletions.
diff --git a/appcode/rboot-bigflash.c b/appcode/rboot-bigflash.c
@@ -5,9 +5,6 @@
 // See license.txt for license terms.
 //////////////////////////////////////////////////
 
-typedef unsigned int uint32;
-typedef unsigned char uint8;
-
 #include <rboot.h>
 
 #ifdef BOOT_BIG_FLASH

diff --git a/rboot-private.h b/rboot-private.h
@@ -8,10 +8,6 @@
 // See license.txt for license terms.
 //////////////////////////////////////////////////
 
-typedef int int32;
-typedef unsigned int uint32;
-typedef unsigned char uint8;
-
 #include <rboot.h>
 
 #define NOINLINE __attribute__ ((noinline))
@@ -20,9 +16,6 @@ typedef unsigned char uint8;
 #define ROM_MAGIC_NEW1 0xea
 #define ROM_MAGIC_NEW2 0x04
 
-#define TRUE 1
-#define FALSE 0
-
 // buffer size, must be at least 0x10 (size of rom_header_new structure)
 #define BUFFER_SIZE 0x100
 

diff --git a/rboot.h b/rboot.h
@@ -12,6 +12,8 @@
 extern "C" {
 #endif
 
+#include <c_types.h> // uint* types
+
 #ifdef RBOOT_INTEGRATION
 #include <rboot-integration.h>
 #endif

diff --git a/testload1.c b/testload1.c
@@ -2,7 +2,7 @@
 // richardaburton@gmail.com
 // See license.txt for license terms.
 
-#include "testload1.h"
+#include <c_types.h>
 
 void call_user_start(void) {
 	uint8 loop;

diff --git a/testload1.h b/testload1.h
diff --git a/testload2.c b/testload2.c
@@ -2,7 +2,7 @@
 // richardaburton@gmail.com
 // See license.txt for license terms.
 
-#include "testload2.h"
+#include <c_types.h>
 
 void call_user_start(void) {
 	uint8 loop;

diff --git a/testload2.h b/testload2.h