From 151772d4c77e4fc969bb9e5638fe0ee1db8bd748 Mon Sep 17 00:00:00 2001
From: Astrid Smith
Date: Thu, 16 Sep 2010 14:36:06 -0700
Subject: Cleared up some compiler errors

---
 680.h      | 6 ++++++
 Makefile   | 3 ++-
 bankswap.c | 4 ++--
 loader.c   | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/680.h b/680.h
index e69de29..f55ffe8 100644
--- a/680.h
+++ b/680.h
@@ -0,0 +1,6 @@
+#ifndef H680_H
+#define H680_H
+
+extern void throw_error(char *);
+
+#endif
diff --git a/Makefile b/Makefile
index 45601d9..9eccfbc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,13 @@
 ASM_FILES=alu.asm flags.asm opcodes.asm ports.asm interrupts.asm main.asm
 ASM=main.asm
 C_FILES=loader.c bankswap.c video.c misc.c debug.c
+C_HEADERS=680.h asm_vars.h
 MADE_FILES=testbenches/zexdoc.h testbenches/mine.h
 
 TIGCCFLAGS=-Wall
 CFLAGS=-Wall -ltifiles
 
-z680.89z: $(ASM_FILES) $(C_FILES) $(MADE_FILES)
+z680.89z: $(ASM_FILES) $(C_FILES) $(MADE_FILES) $(C_HEADERS)
 	tigcc $(TIGCCFLAGS) $(ASM) $(C_FILES) -o z680.89z
 
 packager: packager.c
diff --git a/bankswap.c b/bankswap.c
index 107737f..e6bd72f 100644
--- a/bankswap.c
+++ b/bankswap.c
@@ -11,7 +11,7 @@
 /* Process orders to swap bank A (port 06, 0x4000). */
 void bankswap_a_write(char data)
 {
-	mem_page_1 = pages[data];
+	mem_page_1 = pages[(int)data];
 	mem_page_loc_1 = data;
 	return;
 }
@@ -19,7 +19,7 @@ void bankswap_a_write(char data)
 /* Process orders to swap bank B (port 07, 0x8000). */
 void bankswap_b_write(char data)
 {
-	mem_page_2 = pages[data];
+	mem_page_2 = pages[(int)data];
 	mem_page_loc_2 = data;
 	return;
 }
diff --git a/loader.c b/loader.c
index 6d79b65..91367c2 100644
--- a/loader.c
+++ b/loader.c
@@ -95,7 +95,7 @@ void *deref_page(int number)
 	char *fdata;
 	int fsize;
 
-	sprintf(&page_name, "pg_%02x", number);
+	sprintf(page_name, "pg_%02x", number);
 	hsym = SymFind(SYMSTR(page_name));
 
 	if(hsym.folder == 0)
-- 
cgit v1.2.3