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

diff --git a/ROM2/vend.h b/ROM2/vend.h
index a1ea2cc..ea079b4 100644
--- a/ROM2/vend.h
+++ b/ROM2/vend.h
@@ -19,33 +19,51 @@
 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
+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)
+
+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_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 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); }