X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fhelpers.c;h=13c2d36360a8484317a94f087db8e39e3678ec90;hb=77f2f2b514bc8b3a5e4c23ab02afc16bdcedb3c6;hp=b66f5ee60dd8cad3f08c05cc9a30423b9c721e6f;hpb=8436ed0d04bf12d2478bffbe3ea45531fa954686;p=uccvend-snackrom.git

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index b66f5ee..13c2d36 100644
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -2,31 +2,26 @@
 #include "vend.h"
 
 void delay(u16 ms) {
-	/* 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 ("ldx %0\n" :: "m" (ms) : "x");
 	asm volatile (
-		"loop:\n"
-		"	dex\n"                  /* 3 */
-		"	beq out\n"              /* 3 */
-		"	ldd #327\n"             /* 3 */
-		"inner_loop:\n" /* 15 cycles each */
-		"	cpd #0x0000\n"          /* 5 */
-		"	beq inner_loop_end\n"   /* 3 */
-		"	subd #0x0001\n"         /* 4 */
-		"	bra inner_loop\n"       /* 3 */
-		"inner_loop_end:\n"
-		"	bra loop\n"             /* 3 */
-		"out:\n"
-		"	pulb\n"
-		"	pula\n"
-		"	pulx\n");
+		"delay_loop:\n"
+		"	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");
+}
+
+u8 my_strlen(char* s) {
+	char *p = s;
+	while (*p) p++;
+	return p-s;
 }
 
 void my_strncpy(char* dst, char* src, u8 max_size) {
@@ -35,7 +30,55 @@ 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;
+}
+
+bool ishex(char b) {
+	if (b >= '0' && b <= '9') return 1;
+	if (b >= 'a' && b <= 'f') return 1;
+	if (b >= 'A' && b <= 'F') return 1;
+	return 0;
+}
+