track r65emu library updates

Makefile

@@ -1,6 +1,7 @@
 PROCESSOR_FAMILY := lm4f
 BOARD := lplm4f120h5qr
 # watch the CPU execute
-#LOCAL_CPPFLAGS := -DCPU_DEBUG
+#CPPFLAGS := -DCPU_DEBUG
+CPPFLAGS := -DHARDWARE_H=\"hw/lm4f-utft-sd.h\"
 
 include energia10.mk

config.h

@@ -7,10 +7,10 @@
 
 #define CPU_INSTRUCTIONS	1000
 
-#define TFT_FG	VGA_LIME
-#define TFT_BG	VGA_BLACK
+#define TFT_FG	GREEN
+#define TFT_BG	BLACK
 #define PROGRAMS	"/apple1/"
 
-#define KRUSADER	1
+#define KRUSADER
 
 #endif

io.cpp

@@ -1,6 +1,7 @@
-#include <UTFT.h>
+#include <Stream.h>
+#include <stdint.h>
 #include <memory.h>
-#include <utftdisplay.h>
+#include <tftdisplay.h>
 #include <sdtape.h>
 #include <keyboard.h>
 #include <timed.h>
@@ -16,7 +17,7 @@ static unsigned r, c;
 static char screen[ROWS][COLS];
 
 void io::reset() {
-	UTFTDisplay::begin(TFT_BG, TFT_FG);
+	TFTDisplay::begin(TFT_BG, TFT_FG);
 	clear();
 	_cy += 2;
 
@@ -97,7 +98,7 @@ void io::draw(char ch, int i, int j) {
 	if (screen[j][i] != ch) {
 		screen[j][i] = ch;
 		char c[2] = { ch, 0 };
-		utft.print(c, i*_cx, j*_cy);
+		drawString(c, i*_cx, j*_cy);
 	}
 }
 

io.h

@@ -2,7 +2,7 @@
 #define _IO_H
 
 // http://mamedev.org/source/src/mess/machine/apple1.c.html
-class io: public UTFTDisplay, Keyboard, public pia {
+class io: public TFTDisplay, Keyboard, public pia {
 public:
 	virtual void reset();
 	virtual void down(uint8_t scan);