X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fhelpers.c;h=ad52123b97a39a1eed528036a861948c5344c75a;hb=f5bc521c83d95d35e852747402a44d1411252c2b;hp=283ca30a37531b355a050157cfa5b261c9fe87f8;hpb=4f35424978e202fff48c2331eee9fd01e3da244f;p=uccvend-snackrom.git

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index 283ca30..ad52123 100644
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -1,45 +1,52 @@
+#include "display_basic.h"
 #include "vend.h"
 
-/* some IO addresses require buffering, so we create some generic buffering
- * functions here
- */
-
-/* create port-specific #defines: */
-#define buffered_port(p) \
-	u8   addr_##p##_buffer = 0; \
-	\
-	void __inline__ outb_##p(u8 b) { \
-		addr_##p##_buffer = b; \
-		outb(p, b); \
-	} \
-	\
-	void __inline__ bset_##p(u8 mask) { \
-		bset((addr_t)&addr_##p##_buffer, mask); \
-		outb(p, addr_##p##_buffer); \
-	} \
-	\
-	void __inline__ bclr_##p(u8 mask) { \
-		bclr((addr_t)&addr_##p##_buffer, mask); \
-		outb(p, addr_##p##_buffer); \
-	} 
-
-void __inline__ outb(addr_t addr, u8 byte) {
-	/* FIXME hmmm */
-	/* asm? */
+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) : "x");
+	asm volatile (
+		"delay_loop:\n"
+		"	dex\n"                        /* 3 */
+		"	beq delay_out\n"              /* 3 */
+		//"	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"
+		"	bra delay_loop\n"             /* 3 */
+		"delay_out:\n" ::: "x", "d");
+		/*"	pulb\n"
+		"	pula\n"
+		"	pulx\n");*/
 }
 
-void __inline__ bset(addr_t addr, u8 mask) {
-	/* FIXME again. asm? */
+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 */
 }
 
-void __inline__ bclr(addr_t addr, u8 mask) {
-	/* FIXME again. asm? */
+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 delay(u16 ms) {
-	/* FIXME fill me in */
+void my_memcpy(char* dst, char* src, u8 size) {
+	u8 i = 0;
+	for (i = 0; i < size; i++) dst[i] = src[i];
 }
-
-/* ports declared here must be defined with buffered_port_h() in vend.h too */
-buffered_port(3800);
-