-/* FIXME: are these typedefs right for m68hc11-gcc? */
-typedef unsigned char u8;
-typedef signed char s8;
-typedef unsigned short u16;
-typedef signed short s16;
-typedef unsigned long u32;
-typedef signed long s32;
-typedef u8 bool;
-typedef u16 addr_t;
-
-/******* from display.c *******/
-
-/* scrolling modes */
-#define WRAP_SCROLL_L 1 /* scroll to the left */
-#define WRAP_SCROLL_R 1 /* scroll to the right */
-#define WRAP_ALTERNATE 2 /* alternate between text */
-
-extern char current_message[1024];
-
-void set_msg(char* newmsg);
-void set_wrap_mode(u8 new_wrap_mode);
-void display_refresh();
+#include "ports.h"
+#include "types.h"
+#include "asm.h"
+
+/* addresses of these set at link time
+ * to add more addresses, define them here with buffered_addr_h, in helpers.c
+ * with buffered_addr, and also in LDFLAGS in the Makefile
+ */
+#define buffered_addr(a) \
+ extern volatile u8* _##a; \
+ u8 a; \
+ extern inline void set_##a(u8 b) { a = *_##a = b; } \
+ extern inline void bset_##a(const u8 m) { bset(&a, m); *_##a = a; } \
+ extern inline void bclr_##a(const u8 m) { bclr(&a, m); *_##a = a; }
+
+buffered_addr(changer_output);
+buffered_addr(misc_output);
+
+extern volatile u8 _switch_input;
+#define switch_input _switch_input
+extern volatile u8 _misc_input;
+#define misc_input _misc_input
+extern volatile u8 _home_sensors;
+#define home_sensors _home_sensors