X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fvend.h;h=ea079b47d966225ae8070a1de8b0d15b9b2c06f6;hb=dc05db765d0f5d7e68f6c786f0572c0da4d7926d;hp=aa6409dd064b401c23a06913d22d66e30fb23420;hpb=caf0c7e19f65db08f81413320f11a8d5a8bea5d2;p=uccvend-snackrom.git

diff --git a/ROM2/vend.h b/ROM2/vend.h
index aa6409d..ea079b4 100644
--- a/ROM2/vend.h
+++ b/ROM2/vend.h
@@ -2,60 +2,70 @@
 #define _VEND_H_
 
 #include "ports.h"
+#include "types.h"
+#include "asm.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;
-
-/* addresses of these set at link time */
-/* to add more addresses, define them here with buffered_addr_h, in helpers.c 
+/* 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_h(a) \
+#define buffered_addr(a) \
 	extern volatile u8* _##a;          \
-	extern inline void set_##a(u8 b);  \
-	extern inline void bset_##a(u8 m); \
-	extern inline void bclr_##a(u8 m); \
+	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_h(switch_input);
-buffered_addr_h(misc_input);
-buffered_addr_h(home_sensors);
-buffered_addr_h(changer_output);
-buffered_addr_h(misc_output);
+buffered_addr(changer_output);
+buffered_addr(misc_output);
 
-void spi_enable();
-void spi_disable();
+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)
 
-/******* from display.c *******/
-
-/* scrolling modes */
-#define WRAP_SCROLL_L  1  /* scroll to the left     */
-#define WRAP_SCROLL_R  2  /* scroll to the right    */
-#define WRAP_ALTERNATE 3  /* alternate between text */
-
-extern char current_message[256];
-
-void display_init();
-void set_msg(char* newmsg);
-void set_wrap_mode(u8 new_wrap_mode);
-void display_refresh();
+extern u16 _stack;
 
+/******* from helpers.c *******/
 void delay(u16 ms);
+void print_amount(u16 amt);
+void my_strncpy(char* dst, char* src, u8 max_size); /* for null-term strings */
+void my_memcpy(char* dst, char* src, u8 size);
 
 /******** Some meaningful bits ******/
+#define PORTA_CHIME         0x10 /* chime is on when set */
+#define PORTA_MOTOR_CLOCK   0x20
+#define PORTA_MOTOR_COL_DISABLE 0x40
 #define PORTA_DISP_RESET    0x80 /* active low */
+
 #define PORTD_KEYPAD_ROW    0x20 /* clear for row 0, set for row 1 */
 
+#define PORTE_MOTOR_OVERCURRENT 0x01
+#define PORTE_MOTOR_OVERVOLTAGE 0x02
+
+/* Address 3000 bits */
+#define A3000_MOTOR_ROW_DISABLE 0x80
+
+/* Address 1800 bits */
+#define A1800_DOOR_OPEN     0x20
+
 /* Address 3800 bits */
 #define A3800_DISPLAY_WRITE  0x04
+#define A3800_MOTOR_DATA        0x10
+#define A3800_MOTOR_COL8_ENABLE 0x20
+#define A3800_MOTOR_COL9_ENABLE 0x40
 
 /******* from main.c *******/
 int __attribute__((noreturn)) main (void);
+void __attribute__((interrupt)) rti (void);
+void __attribute__((interrupt)) sci_interrupt (void);
+void __attribute__((interrupt)) uart_interrupt (void);
+
+/* other one liners */
+extern inline bool door_open() { return switch_input & A1800_DOOR_OPEN; }
+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); }
 
 #endif /* _VEND_H_ */