X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fvend.h;h=5d4f5ac9931a20064f73e973e7c5575e3f58640b;hb=24f4e50d8f5671b40d2662bbcd50e3859bcd5205;hp=03d8c9e888266cd3bc856fe1cd363d74a94870ff;hpb=ffaed3398a8ed1c381f0f3f316b4720caf025d22;p=uccvend-snackrom.git diff --git a/ROM2/vend.h b/ROM2/vend.h index 03d8c9e..5d4f5ac 100644 --- a/ROM2/vend.h +++ b/ROM2/vend.h @@ -26,12 +26,31 @@ extern volatile u8 _misc_input; extern volatile u8 _home_sensors; #define home_sensors _home_sensors +#define is_standalone() (misc_input & 0x01) /* DIP sw 1 */ +#define must_verify() !(misc_input & 0x02) /* DIP sw 2 */ + extern u16 _stack; +extern char _nvram[]; /* 2048 bytes of nvram! */ +// uncomment for testing. char _nvram[20]; /* 2048 bytes of nvram! */ +/* NVRAM map: + * + * START LEN + * 0x800 0x02 mic.h - current challenge + * 0x802 0x10 mic.h - current secret password + * 0x812 + * + */ /******* from helpers.c *******/ void delay(u16 ms); void my_strncpy(char* dst, char* src, u8 max_size); /* for null-term strings */ +bool my_strncmp(char* a, char* b, u8 len); void my_memcpy(char* dst, char* src, u8 size); +void my_memset(char* dst, u8 val, u16 count); +char* u82hex(u8 a); +u8 hex2u8(char msb, char lsb); +char nibble2hexchar(u8 b); +u8 hexchar2u8(char b); /******** Some meaningful bits ******/ #define PORTA_CHIME 0x10 /* chime is on when set */ @@ -41,7 +60,7 @@ void my_memcpy(char* dst, char* src, u8 size); #define PORTD_KEYPAD_ROW 0x20 /* clear for row 0, set for row 1 */ -#define PORTE_MOTOR_OVERCURRENT 0x01 +#define PORTE_MOTOR_NOT_OVERCURRENT 0x01 #define PORTE_MOTOR_OVERVOLTAGE 0x02 /* Address 1800 bits */ @@ -60,7 +79,8 @@ void my_memcpy(char* dst, char* src, u8 size); /******* from main.c *******/ int __attribute__((noreturn)) main (void); void __attribute__((interrupt)) rti (void); -void __attribute__((interrupt)) sci_interrupt (void); +void __attribute__((interrupt)) sci_interrupt_serial (void); +void __attribute__((interrupt)) sci_interrupt_coinmech (void); void __attribute__((interrupt)) uart_interrupt (void); /* other one liners */