megaed-sv: input latency test

diff --git a/megaed-sv/Makefile b/megaed-sv/Makefile
index d9f364a..483307b 100644 (file)
--- a/megaed-sv/Makefile
+++ b/megaed-sv/Makefile
@@ -10,7 +10,7 @@ CFLAGS += -Wall -g -O1 -m68000 -fomit-frame-pointer
 LDLIBS += $(shell $(CC) -print-file-name=libgcc.a)\r
 \r
 TARGET = megaedsv\r
-OBJS = sega_gcc.o main.o\r
+OBJS = sega_gcc.o main.o asmtools.o\r
 \r
 all: $(TARGET).bin\r
 \r

diff --git a/megaed-sv/asmtools.h b/megaed-sv/asmtools.h
new file mode 100644 (file)
index 0000000..a5733d1
--- /dev/null
+++ b/megaed-sv/asmtools.h
@@ -0,0 +1 @@
+void read_joy_responses(u8 resp[8*5]);

diff --git a/megaed-sv/asmtools.s b/megaed-sv/asmtools.s
new file mode 100644 (file)
index 0000000..db93940
--- /dev/null
+++ b/megaed-sv/asmtools.s
@@ -0,0 +1,52 @@
+# Assemble with gas
+#   --register-prefix-optional --bitwise-or
+
+.macro ldarg  arg, stacksz, reg
+    move.l (4 + \arg * 4 + \stacksz)(%sp), \reg
+.endm
+
+
+.globl read_joy_responses /* u8 *rbuf */
+read_joy_responses:
+    ldarg       0, 0, a1
+    movem.l     d2-d7, -(sp)
+    movea.l     #0xa10003, a0
+    move.b      #0x40, (6,a0)
+    move.b      #0x40, (a0)
+
+.macro one_test val
+    move.l      #100/12-1, d0
+0:
+    dbra        d0, 0b
+    move.b      \val, d0
+    move.b      d0, (a0)
+    move.b      (a0), d0
+    move.b      (a0), d1
+    move.b      (a0), d2
+    move.b      (a0), d3
+    move.b      (a0), d4
+    move.b      (a0), d5
+    move.b      (a0), d6
+    move.b      (a0), d7
+    move.b      d0, (a1)+
+    move.b      d1, (a1)+
+    move.b      d2, (a1)+
+    move.b      d3, (a1)+
+    move.b      d4, (a1)+
+    move.b      d5, (a1)+
+    move.b      d6, (a1)+
+    move.b      d7, (a1)+
+.endm
+
+       move.w          #0x2700, sr
+    one_test    #0x00
+    one_test    #0x40
+    one_test    #0x00
+    one_test    #0x40
+    one_test    #0x00
+       move.w          #0x2000, sr
+    movem.l     (sp)+, d2-d7
+    rts
+
+
+# vim:filetype=asmM68k:ts=4:sw=4:expandtab

diff --git a/megaed-sv/main.c b/megaed-sv/main.c
index ef421bd..4065a8a 100644 (file)
--- a/megaed-sv/main.c
+++ b/megaed-sv/main.c
@@ -7,6 +7,7 @@
 #define noinline __attribute__((noinline))
 
 #include "edos.h"
+#include "asmtools.h"
 
 #define GFX_DATA_PORT    0xC00000
 #define GFX_CTRL_PORT    0xC00004
@@ -81,9 +82,6 @@ static void printf_line(int x, const char *buf)
     u32 addr;
     int i;
 
-    if (printf_ypos >= CSCREEN_H) {
-    }
-
     VDP_drawTextML(buf, APLANE, x, printf_ypos++ & (PLANE_H - 1));
 
     if (printf_ypos >= CSCREEN_H) {
@@ -100,23 +98,33 @@ static void printf_line(int x, const char *buf)
     }
 }
 
+#define PRINTF_LEN 40
+
 static noinline int printf(const char *fmt, ...)
 {
+    static const char hexchars[] = "0123456789abcdef";
     static int printf_xpos;
-    char buf[40+11];
+    char c, buf[PRINTF_LEN + 11 + 1];
+    const char *s;
     va_list ap;
     int ival;
+    u32 uval;
     int d = 0;
-    int i;
+    int i, j;
 
     va_start(ap, fmt);
     for (d = 0; *fmt; ) {
-        buf[d] = *fmt++;
-        if (buf[d] != '%') {
-            if (buf[d] == '\n') {
+        int prefix0 = 0;
+        int fwidth = 0;
+
+        c = *fmt++;
+        if (d < PRINTF_LEN)
+            buf[d] = c;
+
+        if (c != '%') {
+            if (c == '\n') {
                 buf[d] = 0;
-                if (d != 0)
-                    printf_line(printf_xpos, buf);
+                printf_line(printf_xpos, buf);
                 d = 0;
                 printf_xpos = 0;
                 continue;
@@ -124,6 +132,18 @@ static noinline int printf(const char *fmt, ...)
             d++;
             continue;
         }
+        if (d >= PRINTF_LEN)
+            continue;
+
+        if (*fmt == '0') {
+            prefix0 = 1;
+            fmt++;
+        }
+
+        while ('1' <= *fmt && *fmt <= '9') {
+            fwidth = fwidth * 10 + *fmt - '0';
+            fmt++;
+        }
 
         switch (*fmt++) {
         case '%':
@@ -145,12 +165,25 @@ static noinline int printf(const char *fmt, ...)
             }
             buf[d++] = '0' + ival;
             break;
+        case 'x':
+            uval = va_arg(ap, int);
+            while (fwidth > 0 && uval < (1 << (fwidth - 1) * 4)) {
+                buf[d++] = prefix0 ? '0' : ' ';
+                fwidth--;
+            }
+            for (j = 1; j < 8 && uval >= (1 << j * 4); j++)
+                ;
+            for (j--; j >= 0; j--)
+                buf[d++] = hexchars[(uval >> j * 4) & 0x0f];
+            break;
         case 's':
-            // s = va_arg(ap, char *);
+            s = va_arg(ap, char *);
+            while (*s && d < PRINTF_LEN)
+                buf[d++] = *s++;
+            break;
         default:
             // don't handle, for now
             d++;
-            buf[d++] = *fmt++;
             va_arg(ap, void *);
             break;
         }
@@ -181,10 +214,82 @@ void vbl(void)
 {
 }
 
+static int usb_read_while_ready(OsRoutine *ed,
+    void *buf_, int maxlen)
+{
+    u8 *buf = buf_;
+    int r = 0;
+
+    while (ed->usbRdReady() && r < maxlen)
+        buf[r++] = ed->usbReadByte();
+
+    return r;
+}
+
+/*
+ * TH = 1 : ?1CBRLDU    3-button pad return value (not read)
+ * TH = 0 : ?0SA00DU    3-button pad return value
+ * TH = 1 : ?1CBRLDU    3-button pad return value
+ * TH = 0 : ?0SA0000    D3-0 are forced to '0'
+ * TH = 1 : ?1CBMXYZ    Extra buttons returned in D3-0
+ * TH = 0 : ?0SA1111    D3-0 are forced to '1'
+ */
+static void test_joy_latency(int *min_out, int *max_out)
+{
+    u8 rbuf[8 * 6];
+    int min = 8;
+    int max = 0;
+    int i, v, b, e;
+
+    for (i = 0; i < 64; i++) {
+        read_joy_responses(rbuf);
+
+        for (b = 0; b < 8 * 4; b++) {
+            v = b & 7;
+            e = (b & 0x08) ? 0x0c : 0;
+            if ((rbuf[b] & 0x0c) == e) {
+                if (v < min)
+                    min = v;
+            }
+            else if (v > max)
+                max = v;
+        }
+    }
+
+    /* print out the last test */
+    for (b = 0; b < 8 * 5; b++) {
+        printf(" %02x", rbuf[b]);
+        if ((b & 7) == 7)
+            printf("\n");
+    }
+    printf("\n");
+
+    *min_out = min;
+    *max_out = max;
+}
+
+static int do_test(OsRoutine *ed, u8 b3)
+{
+    int min = 0, max = 0;
+
+    switch (b3)
+    {
+    case 'j':
+        test_joy_latency(&min, &max);
+        printf("latency: %d - %d\n\n", min, max);
+        return 0;
+    default:
+        break;
+    }
+
+    return -1;
+}
+
 int main()
 {
     OsRoutine *ed;
-    int i, j = 0;
+    u8 buf[16];
+    int i, d, ret;
 
     ed = (OsRoutine *) *(u32 *)0x1A0;
     ed->memInitDmaCode(); 
@@ -205,16 +310,52 @@ int main()
 
     /* note: relying on ED menu's font setup here.. */
 
-    // VDP_drawTextML("hello", APLANE, 0, 0);
-    printf("hello1");
-    printf(" hello2\n");
-    printf("hello3\n");
-
     for (;;) {
-        for (i = 0; i < 30; i++)
+        if (!ed->usbRdReady()) {
             asm volatile("stop #0x2000");
+            continue;
+        }
+
+        buf[0] = ed->usbReadByte();
+        if (buf[0] == ' ')
+            continue;
+        if (buf[0] != '*') {
+            d = 1;
+            goto bad_input;
+        }
+
+        /* note: OS uses Twofgsr */
+        buf[1] = ed->usbReadByte();
+        switch (buf[1]) {
+        case 'T':
+            ed->usbWriteByte('k');
+            break;
+        /* custom */
+        case 't':
+            buf[2] = ed->usbReadByte();
+            ret = do_test(ed, buf[2]);
+            if (ret != 0) {
+                d = 3;
+                goto bad_input;
+            }
+            ed->usbWriteByte('k');
+            break;
+        default:
+            d = 2;
+            goto bad_input;
+        }
+
+        continue;
+
+bad_input:
+        ret = usb_read_while_ready(ed, buf + d, sizeof(buf) - d);
+        buf[d + ret] = 0;
+        printf("bad cmd: %s\n", buf);
+        /* consume all remaining data */
+        while (ed->usbRdReady())
+            usb_read_while_ready(ed, buf, sizeof(buf));
 
-        printf("hello %d\n", j++);
+        ed->usbWriteByte('b');
     }
 
     return 0;