X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fvend.h;h=03d8c9e888266cd3bc856fe1cd363d74a94870ff;hb=69e91c633f123ca0d250147929decb0c678eb2e9;hp=a1ea2cccdde32b09432bd58ab8ce090006023410;hpb=45c42e3e9f2149e45f6642ac3fbab9010bc05455;p=uccvend-snackrom.git

diff --git a/ROM2/vend.h b/ROM2/vend.h
index a1ea2cc..03d8c9e 100644
--- a/ROM2/vend.h
+++ b/ROM2/vend.h
@@ -10,11 +10,11 @@
  * 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; }
+	extern volatile u8 _##a;          \
+	volatile u8 a; \
+	extern inline void set_##a(u8 b) { a = b; _##a = b; } \
+	extern inline void bset_##a(const u8 m) { bset((void*)&a, m); _##a = a; } \
+	extern inline void bclr_##a(const u8 m) { bclr((void*)&a, m); _##a = a; }
 
 buffered_addr(changer_output);
 buffered_addr(misc_output);
@@ -26,26 +26,44 @@ extern volatile u8 _misc_input;
 extern volatile u8 _home_sensors;
 #define home_sensors _home_sensors
 
+extern u16 _stack;
+
 /******* from helpers.c *******/
 void delay(u16 ms);
+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_DISP_RESET    0x80 /* active low */
 #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 1800 bits */
 #define A1800_DOOR_OPEN     0x20
 
+/* Address 3000 bits */
+#define A3000_MOTOR_ROW_DISABLE 0x80
+
 /* Address 3800 bits */
-#define A3800_DISPLAY_WRITE  0x04
+#define A3800_KEYPAD_STROBE 0x04
+#define A3800_DISPLAY_WRITE  0x08
+#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); }