General cruft removal

[uccvend-snackrom.git] / ROM2 / helpers.c

diff --git a/ROM2/helpers.c b/ROM2/helpers.c
index f7bb406..13c2d36 100644 (file)
--- a/ROM2/helpers.c
+++ b/ROM2/helpers.c
@@ -2,18 +2,9 @@
 #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) : "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 */
@@ -25,9 +16,6 @@ void delay(u16 ms) {
                "       beq delay_out\n"              /* 3 */
                "       bra delay_loop\n"             /* 3 */
                "delay_out:\n" ::: "x", "d");
-               /*"     pulb\n"
-               "       pula\n"
-               "       pulx\n");*/
 }
 
 u8 my_strlen(char* s) {
@@ -87,3 +75,10 @@ char* u82hex(u8 a) {
        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;
+}
+