X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=ROM2%2Fhelpers.c;h=f7bb4062fe0b5786aa5888c8c5f1a275e9558aa2;hb=24f4e50d8f5671b40d2662bbcd50e3859bcd5205;hp=a35073cf5ca7400a177f08ff1e9127238fcfe7b5;hpb=2e7a8beb908896930042bc0564fbd16f3e0b0b62;p=uccvend-snackrom.git

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index a35073c..f7bb406 100644
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -1,23 +1,39 @@
 #include "display_basic.h"
 #include "vend.h"
 
-#define DELAY_MAGIC 20 /* FIXME: number of loops for ~ 1 millisecond (< 256) */
 void delay(u16 ms) {
-	u8 i;
-	for (;ms;ms--) {
-		for (i=0;i<DELAY_MAGIC; i++)
-			asm("nop\nnop\nnop\nnop\nnop\n");
-	}
+	/* 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) : "x");
+	asm volatile (
+		"delay_loop:\n"
+		//"	ldd #327\n"                   /* 3 */
+		"	ldd #150\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"
+		"	dex\n"                        /* 3 */
+		"	beq delay_out\n"              /* 3 */
+		"	bra delay_loop\n"             /* 3 */
+		"delay_out:\n" ::: "x", "d");
+		/*"	pulb\n"
+		"	pula\n"
+		"	pulx\n");*/
 }
 
-void print_amount(u16 amt) {
-	/* take amt and show it on screen with a $ sign */
-	char str[10] = {' ', '$', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '};
-	u8 pos;
-	for (pos = 7; amt; pos--, amt/=10) {
-		str[pos] = amt%10 + '0';
-	}
-	set_msg(str);
+u8 my_strlen(char* s) {
+	char *p = s;
+	while (*p) p++;
+	return p-s;
 }
 
 void my_strncpy(char* dst, char* src, u8 max_size) {
@@ -26,7 +42,48 @@ void my_strncpy(char* dst, char* src, u8 max_size) {
 	if (src[i] == 0 && i < max_size) dst[i] = 0; /* null terminator */
 }
 
+bool my_strncmp(char* a, char* b, u8 len) {
+	u8 i;
+	for (i = 0; i < len; i++) {
+		if (*a != *b) return 0;
+		a++;
+		b++;
+	}
+	return 1;
+}
+
 void my_memcpy(char* dst, char* src, u8 size) {
 	u8 i = 0;
 	for (i = 0; i < size; i++) dst[i] = src[i];
 }
+
+void my_memset(char* dst, u8 val, u16 count) {
+	char* c;
+	for (c = dst; c < dst+count; c++) *c = val;
+}
+
+u8 hexchar2u8(char b) {
+	if (b >= '0' && b <= '9') return b-'0';
+	if (b >= 'a' && b <= 'f') return b-'a'+0x0a;
+	if (b >= 'A' && b <= 'F') return b-'A'+0x0a;
+	return 0;
+}
+
+char nibble2hexchar(u8 b) {
+	if (b <= 9) return b+'0';
+	if (b >= 10 && b <= 15) return b+'A'-10;
+	return 'X';
+}
+
+u8 hex2u8(char msb, char lsb) {
+	return (hexchar2u8(msb) << 4) + hexchar2u8(lsb);
+}
+
+static char hexconv_buf[3];
+char* u82hex(u8 a) {
+	hexconv_buf[0] = nibble2hexchar((a&0xf0) >> 4);
+	hexconv_buf[1] = nibble2hexchar(a&0x0f);
+	hexconv_buf[2] = '\0';
+	return hexconv_buf;
+}
+