X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fhelpers.c;h=5f0da09c9770b2706e9f61bec11213d25cd47900;hb=b14807a016c121bc79efd5702ffba33c1dbd9be2;hp=68adb3f6489aa9b683dc47c423e37837c4529fca;hpb=caf0c7e19f65db08f81413320f11a8d5a8bea5d2;p=uccvend-snackrom.git

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index 68adb3f..5f0da09 100644
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -1,26 +1,41 @@
+#include "display_basic.h"
 #include "vend.h"
 
 void delay(u16 ms) {
-	/* FIXME fill me in */
+	/* delay routine written in assembly so we know what we're really getting.
+	 * each inner loop should take ~1 ms to execute.
+	 * 15 cycles * (1/4.9152Mhz) * 327 = 0.997 ms + a little bit on the fringes.
+	 *
+	 * XXX - how do we know gcc isn't optimising this? it seems to optimise after
+	 * parsing C -> asm, but before asm -> machine code.
+	 */
+	//asm volatile ("pshx\npsha\npshb\n"); /* save registers */
+	asm volatile ("ldx %0\n" :: "m" (ms));
+	asm volatile (
+		"delay_loop:\n"
+		"	dex\n"                        /* 3 */
+		"	beq delay_out\n"              /* 3 */
+		"	ldd #327\n"                   /* 3 */
+		"delay_inner_loop:\n" /* 15 cycles each */
+		"	cpd #0x0000\n"                /* 5 */
+		"	beq delay_inner_loop_end\n"   /* 3 */
+		"	subd #0x0001\n"               /* 4 */
+		"	bra delay_inner_loop\n"       /* 3 */
+		"delay_inner_loop_end:\n"
+		"	bra delay_loop\n"             /* 3 */
+		"delay_out:\n");
+		/*"	pulb\n"
+		"	pula\n"
+		"	pulx\n");*/
 }
 
-#define buffered_addr(a) \
-	u8 a; \
-	inline void set_##a(u8 b) { a = *_##a = b; } \
-	inline void bset_##a(u8 m) { a |= m; *_##a = a; } \
-	inline void bclr_##a(u8 m) { a &= ~m ; *_##a = a; }
-
-buffered_addr(switch_input)
-buffered_addr(misc_input)
-buffered_addr(home_sensors)
-buffered_addr(changer_output)
-buffered_addr(misc_output)
-
-
-inline void spi_enable() {
-	_io_ports[M6811_SPCR] |= M6811_SPE;
+void my_strncpy(char* dst, char* src, u8 max_size) {
+	u8 i;
+	for (i = 0; src[i] && i < max_size; i++) dst[i] = src[i];
+	if (src[i] == 0 && i < max_size) dst[i] = 0; /* null terminator */
 }
 
-inline void spi_disable() {
-	_io_ports[M6811_SPCR] &= ~M6811_SPE;
+void my_memcpy(char* dst, char* src, u8 size) {
+	u8 i = 0;
+	for (i = 0; i < size; i++) dst[i] = src[i];
 }