#ifndef _VEND_H_
#define _VEND_H_
-/* 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(switch_input);
+buffered_addr(misc_input);
+buffered_addr(home_sensors);
+buffered_addr(changer_output);
+buffered_addr(misc_output);
+
+extern inline void spi_enable() { bset((void*)&_io_ports[M6811_SPCR], M6811_SPE); }
+extern inline void spi_disable() { bclr((void*)&_io_ports[M6811_SPCR], M6811_SPE); }
/******* from helpers.c *******/
-#define buffered_port_h(p) \
- void outb_##p(u8 b); \
- void bset_##p(u8 mask); \
- void bclr_##p(u8 mask);
-
-void outb(u16 port, u8 byte);
-void bset(u16 addr, u8 mask);
-void bclr(u16 addr, u8 mask);
-
-buffered_port_h(3800);
-
void delay(u16 ms);
-/******** Some IO Ports ******/
-#define PORTA 0x1000
+/******** Some meaningful bits ******/
#define PORTA_DISP_RESET 0x80 /* active low */
-
-#define SPCR 0x1028 /* Serial Peripheral Control Register */
-#define SPCR_SPE 0x40 /* Serial Peripheral System Enable */
+#define PORTA_CHIME 0x10 /* chime is on when set */
+#define PORTD_KEYPAD_ROW 0x20 /* clear for row 0, set for row 1 */
/* Address 3800 bits */
#define A3800_DISPLAY_WRITE 0x04
+/******* from main.c *******/
+int __attribute__((noreturn)) main (void);
+void __attribute__((interrupt)) rti (void);
+
#endif /* _VEND_H_ */