X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=host%2Fmain.c;h=f8f74c90e453cae0f24c4963164ac1140e54c273;hb=e4d23548386133037c0f9ccc02e56facd718d2ce;hp=a21e41904e3730debb640afb4ede09b0978c607a;hpb=e8e66d024473bcf0c9e535cc3cb8b71677257687;p=teensytas.git

diff --git a/host/main.c b/host/main.c
index a21e419..f8f74c9 100644
--- a/host/main.c
+++ b/host/main.c
@@ -587,13 +587,22 @@ out:
   return 2;
 }
 
-static int tas_data_to_teensy(uint8_t b, uint8_t *data)
+static int tas_data_to_teensy(uint8_t b, uint8_t *data, FILE *logf)
 {
+  uint8_t t;
+
   /* SCBA RLDU */
   /*     v     */
   /* ?0SA 00DU, ?1CB RLDU */
   data[0] = (b & 0x13) | ((b >> 2) & 0x20);
   data[1] = (b & 0x0f) | ((b >> 1) & 0x30);
+
+  if (logf != NULL) {
+    fwrite(&data[0], 1, 1, logf);
+    t = data[1] | 0x40; // expected TH
+    fwrite(&t, 1, 1, logf);
+  }
+
   return 2;
 }
 
@@ -636,8 +645,9 @@ int main(int argc, char *argv[])
   fd_set rfds, wfds;
   const char *tasfn = NULL;
   const char *outfn = NULL;
+  const char *logfn = NULL;
   uint8_t *tas_data = NULL;
-  int use_readinc = 0; // frame increment on read
+  int use_vsync = 0; // frame increment on vsync
   int tas_skip = 0;
   int enable_sent = 0;
   int abort_sent = 0;
@@ -649,6 +659,7 @@ int main(int argc, char *argv[])
   struct timeval *timeout = NULL;
   struct timeval tout;
   FILE *outf = NULL;
+  FILE *logf = NULL;
   int i, ret = -1;
   int fd;
 
@@ -667,14 +678,20 @@ int main(int argc, char *argv[])
           missing_arg(i);
         outfn = argv[i];
         continue;
+      case 'l':
+        i++;
+        if (argv[i] == NULL)
+          missing_arg(i);
+        logfn = argv[i];
+        continue;
       case 's':
         i++;
         if (argv[i] == NULL)
           missing_arg(i);
         tas_skip = atoi(argv[i]);
         continue;
-      case 'r':
-        use_readinc = 1;
+      case 'v':
+        use_vsync = 1;
         continue;
       default:
         fprintf(stderr, "bad arg: %s\n", argv[i]);
@@ -775,7 +792,16 @@ int main(int argc, char *argv[])
   if (outfn != NULL) {
     outf = fopen(outfn, "w");
     if (outf == NULL) {
-      fprintf(stderr, "fopen %s: ", tasfn);
+      fprintf(stderr, "fopen %s: ", outfn);
+      perror("");
+      return 1;
+    }
+  }
+
+  if (logfn != NULL) {
+    logf = fopen(logfn, "wb");
+    if (logf == NULL) {
+      fprintf(stderr, "fopen %s: ", logfn);
       perror("");
       return 1;
     }
@@ -863,6 +889,8 @@ int main(int argc, char *argv[])
       switch (c) {
       case 'r':
         enable_sent = 0;
+        if (logf != NULL)
+          rewind(logf);
         break;
       }
     }
@@ -921,7 +949,7 @@ int main(int argc, char *argv[])
 
             for (i = 0; i < sizeof(pkt_out.data); ) {
               i += tas_data_to_teensy(tas_data[frames_sent],
-                     pkt_out.data + i);
+                     pkt_out.data + i, logf);
 
               frames_sent++;
               if (frames_sent >= frame_count)
@@ -929,8 +957,11 @@ int main(int argc, char *argv[])
             }
             pkt_out.size = i;
           }
-          else
+          else {
             pkt_out.type = PKT_STREAM_END;
+            if (logf != NULL)
+              fflush(logf);
+          }
 
           ret = submit_urb(dev.fd, &urb[URB_DATA_OUT],
                   dev.ifaces[0].ep_out, &pkt_out, sizeof(pkt_out));
@@ -963,6 +994,12 @@ int main(int argc, char *argv[])
         /* debug text */
         buf_dbg[reaped_urb->actual_length] = 0;
         printf("%s", buf_dbg);
+
+        // continue receiving debug before sending out stuff
+        tout.tv_sec = 0;
+        tout.tv_usec = 1000;
+        timeout = &tout;
+        continue;
       }
       else {
         fprintf(stderr, "reaped unknown urb? %p #%zu\n",
@@ -980,7 +1017,7 @@ int main(int argc, char *argv[])
       pkt_out.type = PKT_STREAM_ENABLE;
       pkt_out.enable.stream_to = (tas_data != NULL);
       pkt_out.enable.stream_from = (outf != NULL);
-      pkt_out.enable.use_readinc = use_readinc;
+      pkt_out.enable.use_readinc = !use_vsync;
 
       ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out,
                        &pkt_out, sizeof(pkt_out));
@@ -1033,6 +1070,8 @@ dev_close:
 
   if (outf != NULL)
     fclose(outf);
+  if (logf != NULL)
+    fclose(logf);
 
   if (dev.fd != -1) {
     /* deal with pending URBs */