git.ucc.asn.au
/
uccvend-snackrom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put a useful filename there.
[uccvend-snackrom.git]
/
ROM2
/
vend.h
diff --git
a/ROM2/vend.h
b/ROM2/vend.h
index
c9cc6d6
..
7686620
100644
(file)
--- a/
ROM2/vend.h
+++ b/
ROM2/vend.h
@@
-10,25
+10,32
@@
* with buffered_addr, and also in LDFLAGS in the Makefile
*/
#define buffered_addr(a) \
* 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);
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
+
+#define is_standalone() (misc_input & 0x01) /* DIP sw 1 */
+
+extern u16 _stack;
/******* from helpers.c *******/
void delay(u16 ms);
/******* 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 */
+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);
/******** Some meaningful bits ******/
#define PORTA_CHIME 0x10 /* chime is on when set */
/******** Some meaningful bits ******/
#define PORTA_CHIME 0x10 /* chime is on when set */
@@
-38,17
+45,18
@@
void print_amount(u16 amt);
#define PORTD_KEYPAD_ROW 0x20 /* clear for row 0, set for row 1 */
#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
#define PORTE_MOTOR_OVERVOLTAGE 0x02
-/* Address 3000 bits */
-#define A3000_MOTOR_ROW_DISABLE 0x80
-
/* Address 1800 bits */
#define A1800_DOOR_OPEN 0x20
/* Address 1800 bits */
#define A1800_DOOR_OPEN 0x20
+/* Address 3000 bits */
+#define A3000_MOTOR_ROW_DISABLE 0x80
+
/* Address 3800 bits */
/* 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
#define A3800_MOTOR_DATA 0x10
#define A3800_MOTOR_COL8_ENABLE 0x20
#define A3800_MOTOR_COL9_ENABLE 0x40
@@
-56,6
+64,9
@@
void print_amount(u16 amt);
/******* from main.c *******/
int __attribute__((noreturn)) main (void);
void __attribute__((interrupt)) rti (void);
/******* from main.c *******/
int __attribute__((noreturn)) main (void);
void __attribute__((interrupt)) rti (void);
+void __attribute__((interrupt)) sci_interrupt_serial (void);
+void __attribute__((interrupt)) sci_interrupt_coinmech (void);
+void __attribute__((interrupt)) uart_interrupt (void);
/* other one liners */
extern inline bool door_open() { return switch_input & A1800_DOOR_OPEN; }
/* other one liners */
extern inline bool door_open() { return switch_input & A1800_DOOR_OPEN; }
UCC
git Repository :: git.ucc.asn.au