X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=teensytas.git;a=blobdiff_plain;f=host%2Fmain.c;h=73b8a9f21a1e9cfac750bb43dc55bdfbbae320f7;hp=e372b2b356a48760ed8777cb344722de0ad6529a;hb=0172d3f32bb6e69877f66428bdcc02bd9bf62280;hpb=f20de073955d85e0f7594a40056674cab99fe79c

diff --git a/host/main.c b/host/main.c
index e372b2b..73b8a9f 100644
--- a/host/main.c
+++ b/host/main.c
@@ -1,4 +1,30 @@
+/*
+ * TeensyTAS, TAS input player for MegaDrive
+ * Copyright (c) 2014 notaz
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include <sys/types.h>
@@ -260,9 +286,11 @@ static int enable_echo(int enable)
 
   // printf("lflag: 0%o\n", tty.c_lflag);
   if (enable)
-    tty.c_lflag |= ECHO;
-  else
-    tty.c_lflag &= ~ECHO;
+    tty.c_lflag |= ECHO | ICANON;
+  else {
+    tty.c_lflag &= ~(ECHO | ICANON);
+    tty.c_cc[VMIN] = tty.c_cc[VTIME] = 0;
+  }
 
   ret = tcsetattr(fd, TCSANOW, &tty);
   if (ret != 0) {
@@ -277,11 +305,12 @@ out:
   return retval;
 }
 
+static int g_exit;
+
 static void signal_handler(int sig)
 {
-  enable_echo(1);
+  g_exit = 1;
   signal(sig, SIG_DFL);
-  raise(sig);
 }
 
 /* ?0SA 00DU, ?1CB RLDU */
@@ -404,6 +433,204 @@ struct gmv_tas {
   uint8_t data[0][3];
 };
 
+static uint8_t *import_gmv(FILE *f, long size, int *frame_count)
+{
+  struct gmv_tas *gmv;
+  uint8_t *out;
+  int ret;
+  int i;
+
+  if (size < (long)sizeof(*gmv)) {
+    fprintf(stderr, "bad gmv size: %ld\n", size);
+    return NULL;
+  }
+
+  gmv = malloc(size);
+  if (gmv == NULL) {
+    fprintf(stderr, "OOM?\n");
+    return NULL;
+  }
+  ret = fread(gmv, 1, size, f);
+  if (ret != size) {
+    fprintf(stderr, "fread %d/%ld: ", ret, size);
+    perror("");
+    return NULL;
+  }
+
+  *frame_count = (size - sizeof(*gmv)) / sizeof(gmv->data[0]);
+
+  /* check the GMV.. */
+  if (*frame_count <= 0 || size != sizeof(*gmv) + *frame_count * 3) {
+    fprintf(stderr, "broken gmv? frames=%d\n", *frame_count);
+    return NULL;
+  }
+
+  if (strncmp(gmv->sig, "Gens Movie TEST", 15) != 0) {
+    fprintf(stderr, "bad GMV sig\n");
+    return NULL;
+  }
+  if (gmv->ctrl1 != '3') {
+    fprintf(stderr, "unhandled controlled config: '%c'\n", gmv->ctrl1);
+    //return NULL;
+  }
+  if (gmv->ver >= 'A') {
+    if (gmv->flags & 0x40) {
+      fprintf(stderr, "unhandled flag: movie requires a savestate\n");
+      return NULL;
+    }
+    if (gmv->flags & 0x20) {
+      fprintf(stderr, "unhandled flag: 3-player movie\n");
+      return NULL;
+    }
+    if (gmv->flags & ~0x80) {
+      //fprintf(stderr, "unhandled flag(s): %04x\n", gmv->flags);
+      //return 1;
+    }
+  }
+  gmv->name[39] = 0;
+  printf("loaded GMV: %s\n", gmv->name);
+  printf("%d frames, %u rerecords\n",
+         *frame_count, gmv->rerecord_count);
+
+  out = malloc(*frame_count * sizeof(out[0]));
+  if (out == NULL) {
+    fprintf(stderr, "OOM?\n");
+    return NULL;
+  }
+
+  for (i = 0; i < *frame_count; i++) {
+    out[i] = gmv->data[i][0];
+
+    if (gmv->data[i][1] != 0xff || gmv->data[i][2] != 0xff)
+    {
+      fprintf(stderr, "f %d: unhandled byte(s) %02x %02x\n",
+        i, gmv->data[i][1], gmv->data[i][2]);
+    }
+  }
+
+  return out;
+}
+
+static int do_bkm_char(char c, char expect, uint8_t *val, int bit)
+{
+  if (c == expect) {
+    *val &= ~(1 << bit);
+    return 0;
+  }
+  if (c == '.')
+    return 0;
+
+  fprintf(stderr, "unexpected bkm char: '%c' instead of '%c'\n",
+          c, expect);
+  return 1;
+}
+
+static uint8_t *import_bkm(FILE *f, int *frame_count)
+{
+  uint8_t *out = NULL, val;
+  int count = 0;
+  int alloc = 0;
+  int line = 0;
+  char buf[256];
+  const char *r;
+  char *p;
+  int i;
+
+  while ((p = fgets(buf, sizeof(buf), f)) != NULL) {
+    line++;
+    if (p[0] != '|')
+      continue;
+
+    if (strlen(p) < 30)
+      goto unhandled_line;
+    if (p[30] != '\r' && p[30] != '\n')
+      goto unhandled_line;
+    p[30] = 0;
+
+    if (count >= alloc) {
+      alloc = alloc * 2 + 64;
+      out = realloc(out, alloc * sizeof(out[0]));
+      if (out == NULL) {
+        fprintf(stderr, "OOM?\n");
+        return NULL;
+      }
+    }
+
+    val = 0xff;
+
+    if (strncmp(p, "|.|", 3) != 0)
+      goto unhandled_line;
+    p += 3;
+
+    const char ref[] = "UDLRABCS";
+    for (r = ref, i = 0; *r != 0; p++, r++, i++) {
+      if (do_bkm_char(*p, *r, &val, i))
+        goto unhandled_line;
+    }
+
+    if (strcmp(p, "....|............||") != 0)
+      goto unhandled_line;
+
+    out[count++] = val;
+    continue;
+
+unhandled_line:
+    fprintf(stderr, "unhandled bkm line %d: '%s'\n", line, buf);
+    return NULL;
+  }
+
+  printf("loaded bkm, %d frames\n", count);
+  *frame_count = count;
+  return out;
+}
+
+static int write_bkm_frame(FILE *f, const uint8_t *data)
+{
+  /* ?0SA 00DU, ?1CB RLDU */
+  static const char ref[]  = "UDLRABCSXYZM";
+  static const char bits[] = { 0,1,2,3, 12,4,5,13, 16,16,16,16 };
+  uint32_t idata[2];
+  int p, i;
+
+  if (f == NULL) {
+    fprintf(stderr, "%s called without outfile\n", __func__);
+    goto out;
+  }
+
+  idata[0] = 0x10000 | (data[0] << 8) | data[1];
+  idata[1] = ~0;
+
+  fprintf(f, "|.|");
+  for (p = 0; p < 2; p++) {
+    for (i = 0; i < 12; i++)
+      fprintf(f, "%c", (idata[p] & (1 << bits[i])) ? '.' : ref[i]);
+    fprintf(f, "|");
+  }
+  fprintf(f, "|\n");
+
+out:
+  return 2;
+}
+
+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;
+}
+
 static int submit_urb(int fd, struct usbdevfs_urb *urb, int ep,
   void *buf, size_t buf_size)
 {
@@ -423,22 +650,33 @@ enum my_urbs {
   URB_CNT
 };
 
+static void missing_arg(int a)
+{
+  fprintf(stderr, "missing arg: %d\n", a);
+  exit(1);
+}
+
 int main(int argc, char *argv[])
 {
-  const char *tasfn = NULL;
   struct teensy_dev dev;
   struct usbdevfs_urb urb[URB_CNT];
   struct usbdevfs_urb *reaped_urb;
-  int fixed_input_changed;
+  int fixed_input_changed = 0;
   int evdev_fds[16];
   int evdev_fd_cnt = 0;
   int evdev_support;
   int wait_device = 0;
-  int dbg_in_sent = 0;
-  int data_in_sent = 0;
+  int pending_urbs = 0;
   fd_set rfds, wfds;
-  struct gmv_tas *gmv = NULL;
+  const char *tasfn = NULL;
+  const char *outfn = NULL;
+  const char *logfn = NULL;
+  uint8_t *tas_data = NULL;
+  int use_vsync = 0; // frame increment on vsync
+  int no_start_seq = 0;
+  int tas_skip = 0;
   int enable_sent = 0;
+  int abort_sent = 0;
   int frame_count = 0;
   int frames_sent = 0;
   char buf_dbg[64 + 1];
@@ -446,23 +684,51 @@ int main(int argc, char *argv[])
   struct tas_pkt pkt_out;
   struct timeval *timeout = NULL;
   struct timeval tout;
-  int i, ret;
+  FILE *outf = NULL;
+  FILE *logf = NULL;
+  int i, ret = -1;
   int fd;
 
   for (i = 1; i < argc; i++) {
     if (argv[i][0] == '-') {
-      if (strcmp(argv[i], "-m") != 0) {
+      switch (argv[i][1] | (argv[i][2] << 8)) {
+      case 'm':
+        i++;
+        if (argv[i] == NULL)
+          missing_arg(i);
+        tasfn = argv[i];
+        continue;
+      case 'w':
+        i++;
+        if (argv[i] == NULL)
+          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 'v':
+        use_vsync = 1;
+        continue;
+      case 'n':
+        no_start_seq = 1;
+        continue;
+      default:
         fprintf(stderr, "bad arg: %s\n", argv[i]);
         return 1;
       }
-      i++;
-      if (argv[i] == NULL) {
-        fprintf(stderr, "missing arg\n");
-        return 1;
-      }
-      tasfn = argv[i];
-      continue;
     }
+
+    /* remaining args are evdev filenames */
     if (evdev_fd_cnt >= ARRAY_SIZE(evdev_fds)) {
       fprintf(stderr, "too many evdevs\n");
       break;
@@ -487,9 +753,10 @@ int main(int argc, char *argv[])
   }
 
   if (tasfn != NULL) {
+    const char *ext;
     long size;
     FILE *f;
-    
+
     f = fopen(tasfn, "rb");
     if (f == NULL) {
       fprintf(stderr, "fopen %s: ", tasfn);
@@ -500,56 +767,73 @@ int main(int argc, char *argv[])
     fseek(f, 0, SEEK_END);
     size = ftell(f);
     fseek(f, 0, SEEK_SET);
-    if (size < (long)sizeof(*gmv)) {
-      fprintf(stderr, "bad gmv size: %ld\n", size);
-      return 1;
-    }
-    gmv = malloc(size);
-    if (gmv == NULL) {
-      fprintf(stderr, "OOM?\n");
+    if (size <= 0) {
+      fprintf(stderr, "bad size: %ld\n", size);
       return 1;
     }
-    ret = fread(gmv, 1, size, f);
-    if (ret != size) {
-      fprintf(stderr, "fread %d/%ld: ", ret, size);
-      perror("");
+
+    ext = strrchr(tasfn, '.');
+    if (ext == NULL)
+      ext = tasfn;
+    else
+      ext++;
+
+    if (strcasecmp(ext, "gmv") == 0)
+      tas_data = import_gmv(f, size, &frame_count);
+    else if (strcasecmp(ext, "bkm") == 0)
+      tas_data = import_bkm(f, &frame_count);
+    else {
+      fprintf(stderr, "unknown movie type: '%s'\n", ext);
       return 1;
     }
     fclose(f);
-    frame_count = (size - sizeof(*gmv)) / 3;
 
-    /* check the GMV.. */
-    if (frame_count <= 0 || size != sizeof(*gmv) + frame_count * 3) {
-      fprintf(stderr, "broken gmv? frames=%d\n", frame_count);
+    if (tas_data == NULL) {
+      fprintf(stderr, "failed fo parse %s\n", tasfn);
       return 1;
     }
 
-    if (strncmp(gmv->sig, "Gens Movie TEST", 15) != 0) {
-      fprintf(stderr, "bad GMV sig\n");
-      return 1;
-    }
-    if (gmv->ctrl1 != '3') {
-      fprintf(stderr, "unhandled controlled config: '%c'\n", gmv->ctrl1);
-      //return 1;
-    }
-    if (gmv->ver >= 'A') {
-      if (gmv->flags & 0x40) {
-        fprintf(stderr, "unhandled flag: movie requires a savestate\n");
+    if (tas_skip != 0) {
+      if (tas_skip >= frame_count || tas_skip <= -frame_count) {
+        printf("skip out of range: %d/%d\n", tas_skip, frame_count);
         return 1;
       }
-      if (gmv->flags & 0x20) {
-        fprintf(stderr, "unhandled flag: 3-player movie\n");
-        return 1;
+      if (tas_skip > 0) {
+        frame_count -= tas_skip;
+        memmove(&tas_data[0], &tas_data[tas_skip],
+          sizeof(tas_data[0]) * frame_count);
       }
-      if (gmv->flags & ~0x80) {
-        fprintf(stderr, "unhandled flag(s): %04x\n", gmv->flags);
-        //return 1;
+      else {
+        tas_data = realloc(tas_data,
+                     (frame_count - tas_skip) * sizeof(tas_data[0]));
+        if (tas_data == NULL) {
+          fprintf(stderr, "OOM?\n");
+          return 1;
+        }
+        memmove(&tas_data[-tas_skip], &tas_data[0],
+          sizeof(tas_data[0]) * frame_count);
+        memset(&tas_data[0], 0xff, sizeof(tas_data[0]) * -tas_skip);
+        frame_count -= tas_skip;
       }
     }
-    gmv->name[39] = 0;
-    printf("loaded GMV: %s\n", gmv->name);
-    printf("%d frames, %u rerecords\n",
-           frame_count, gmv->rerecord_count);
+  }
+
+  if (outfn != NULL) {
+    outf = fopen(outfn, "w");
+    if (outf == NULL) {
+      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;
+    }
   }
 
   enable_echo(0);
@@ -557,7 +841,7 @@ int main(int argc, char *argv[])
 
   dev.fd = -1;
 
-  while (1)
+  while (!g_exit || (pending_urbs & (1 << URB_DATA_OUT)))
   {
     if (dev.fd == -1) {
       ret = find_device(&dev, 0x16C0, 0x0486);
@@ -574,8 +858,7 @@ int main(int argc, char *argv[])
       }
 
       wait_device = 0;
-      data_in_sent = 0;
-      dbg_in_sent = 0;
+      pending_urbs = 0;
       enable_sent = 0;
       frames_sent = 0;
 
@@ -586,7 +869,7 @@ int main(int argc, char *argv[])
       timeout = &tout;
     }
 
-    if (!data_in_sent) {
+    if (!(pending_urbs & (1 << URB_DATA_IN))) {
       memset(&pkt_in, 0, sizeof(pkt_in));
       ret = submit_urb(dev.fd, &urb[URB_DATA_IN], dev.ifaces[0].ep_in,
                        &pkt_in, sizeof(pkt_in));
@@ -595,9 +878,9 @@ int main(int argc, char *argv[])
         break;
       }
 
-      data_in_sent = 1;
+      pending_urbs |= 1 << URB_DATA_IN;
     }
-    if (!dbg_in_sent) {
+    if (!(pending_urbs & (1 << URB_DBG_IN))) {
       ret = submit_urb(dev.fd, &urb[URB_DBG_IN], dev.ifaces[1].ep_in,
                        buf_dbg, sizeof(buf_dbg) - 1);
       if (ret != 0) {
@@ -605,10 +888,11 @@ int main(int argc, char *argv[])
         break;
       }
 
-      dbg_in_sent = 1;
+      pending_urbs |= 1 << URB_DBG_IN;
     }
 
     FD_ZERO(&rfds);
+    FD_SET(STDIN_FILENO, &rfds);
     for (i = 0; i < evdev_fd_cnt; i++)
       FD_SET(evdev_fds[i], &rfds);
 
@@ -622,8 +906,25 @@ int main(int argc, char *argv[])
     }
     timeout = NULL;
 
+    /* sometihng form stdin? */
+    if (FD_ISSET(STDIN_FILENO, &rfds)) {
+      char c = 0;
+      ret = read(STDIN_FILENO, &c, 1);
+      if (ret <= 0) {
+        perror("read stdin");
+        break;
+      }
+
+      switch (c) {
+      case 'r':
+        enable_sent = 0;
+        if (logf != NULL)
+          rewind(logf);
+        break;
+      }
+    }
+
     /* something from input devices? */
-    fixed_input_changed = 0;
     for (i = 0; i < evdev_fd_cnt; i++) {
       if (FD_ISSET(evdev_fds[i], &rfds)) {
         fixed_input_changed |=
@@ -634,6 +935,8 @@ int main(int argc, char *argv[])
     /* something from USB? */
     if (FD_ISSET(dev.fd, &wfds))
     {
+      unsigned int which_urb;
+
       reaped_urb = NULL;
       ret = ioctl(dev.fd, USBDEVFS_REAPURB, &reaped_urb);
       if (ret != 0) {
@@ -642,13 +945,17 @@ int main(int argc, char *argv[])
         perror("USBDEVFS_REAPURB");
         break;
       }
+      which_urb = reaped_urb - urb;
+      if (which_urb < ARRAY_SIZE(urb))
+        pending_urbs &= ~(1 << which_urb);
+      else {
+        fprintf(stderr, "reaped unknown urb: %p #%u",
+                reaped_urb, which_urb);
+      }
 
       if (reaped_urb != NULL && reaped_urb->status != 0) {
         errno = -reaped_urb->status;
-        if ((unsigned long)(reaped_urb - urb) < ARRAY_SIZE(urb))
-          fprintf(stderr, "urb #%zu: ", reaped_urb - urb);
-        else
-          fprintf(stderr, "unknown urb: ");
+        fprintf(stderr, "urb #%u: ", which_urb);
         perror("");
         if (reaped_urb->status == -EILSEQ) {
           /* this is usually a sign of disconnect.. */
@@ -656,68 +963,71 @@ int main(int argc, char *argv[])
           goto dev_close;
         }
       }
-
-      if (reaped_urb == &urb[URB_DATA_IN]) {
+      else if (reaped_urb == &urb[URB_DATA_IN])
+      {
         /* some request from teensy */
-        int count;
-        uint8_t b;
-
         switch (pkt_in.type) {
         case PKT_STREAM_REQ:
-          printf("%d/%d\n", frames_sent, frame_count);
+          printf("req: %d/%d/%d\n", pkt_in.req.frame,
+            frames_sent, frame_count);
 
-          for (i = 0; i < sizeof(pkt_out.data); i++) {
-            pkt_out.data[i * 2 + 0] = 0x33;
-            pkt_out.data[i * 2 + 1] = 0x3f;
-          }
+          pkt_out.size = 0;
           if (frames_sent < frame_count) {
-            pkt_out.type = PKT_STREAM_DATA;
-
-            count = frame_count - frames_sent;
-            if (count > sizeof(pkt_out.data) / 2)
-              count = sizeof(pkt_out.data) / 2;
-            for (i = 0; i < count; i++) {
-              /* SCBA RLDU */
-              b = gmv->data[frames_sent][0];
-
-              /* ?0SA 00DU, ?1CB RLDU */
-              pkt_out.data[i * 2 + 0] = (b & 0x13) | ((b >> 2) & 0x20);
-              pkt_out.data[i * 2 + 1] = (b & 0x0f) | ((b >> 1) & 0x30);
-
-              if (gmv->data[frames_sent][1] != 0xff
-                  || gmv->data[frames_sent][2] != 0xff)
-              {
-                fprintf(stderr, "f %d: unhandled byte(s) %02x %02x\n",
-                  frames_sent, gmv->data[frames_sent][1],
-                  gmv->data[frames_sent][2]);
-              }
+            pkt_out.type = PKT_STREAM_DATA_TO;
+
+            for (i = 0; i < sizeof(pkt_out.data); ) {
+              i += tas_data_to_teensy(tas_data[frames_sent],
+                     pkt_out.data + i, logf);
 
               frames_sent++;
+              if (frames_sent >= frame_count)
+                break;
             }
+            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));
           if (ret != 0)
-            perror("USBDEVFS_SUBMITURB URB_DATA_OUT PKT_STREAM_DATA");
+            perror("USBDEVFS_SUBMITURB PKT_STREAM_DATA_TO");
+          break;
+
+        case PKT_STREAM_DATA_FROM:
+          printf("f: %d\n", frame_count);
+          if (pkt_in.size == 0 || pkt_in.size > sizeof(pkt_out.data)) {
+            printf("host: got bad DATA_FROM size: %u\n", pkt_in.size);
+            break;
+          }
+          for (i = 0; i < pkt_in.size; ) {
+            i += write_bkm_frame(outf, pkt_in.data + i);
+            frame_count++;
+          }
           break;
 
         default:
           printf("host: got unknown pkt type: %04x\n", pkt_in.type);
           break;
         }
-
-        data_in_sent = 0;
       }
-      else if (reaped_urb == &urb[URB_DATA_OUT]) {
+      else if (reaped_urb == &urb[URB_DATA_OUT])
+      {
       }
-      else if (reaped_urb == &urb[URB_DBG_IN]) {
+      else if (reaped_urb == &urb[URB_DBG_IN])
+      {
         /* debug text */
         buf_dbg[reaped_urb->actual_length] = 0;
         printf("%s", buf_dbg);
-        dbg_in_sent = 0;
+
+        // 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",
@@ -726,18 +1036,30 @@ int main(int argc, char *argv[])
     }
 
     /* something to send? */
-    if (gmv != NULL && !enable_sent) {
+    if (pending_urbs & (1 << URB_DATA_OUT))
+      // can't do that yet
+      continue;
+
+    if ((tas_data != NULL || outf != NULL) && !enable_sent) {
       memset(&pkt_out, 0, sizeof(pkt_out));
       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_vsync;
+      pkt_out.enable.no_start_seq = no_start_seq;
+
       ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out,
                        &pkt_out, sizeof(pkt_out));
       if (ret != 0) {
         perror("USBDEVFS_SUBMITURB PKT_STREAM_ENABLE");
         continue;
       }
+      pending_urbs |= 1 << URB_DATA_OUT;
       enable_sent = 1;
+      frames_sent = 0;
+      continue;
     }
-    if (gmv == NULL && fixed_input_changed) {
+    if (tas_data == NULL && fixed_input_changed) {
       memset(&pkt_out, 0, sizeof(pkt_out));
       pkt_out.type = PKT_FIXED_STATE;
       memcpy(pkt_out.data, fixed_input_state, sizeof(fixed_input_state));
@@ -745,9 +1067,26 @@ int main(int argc, char *argv[])
       ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out,
                        &pkt_out, sizeof(pkt_out));
       if (ret != 0) {
-        perror("USBDEVFS_SUBMITURB URB_DATA_OUT");
+        perror("USBDEVFS_SUBMITURB PKT_FIXED_STATE");
+        break;
+      }
+      fixed_input_changed = 0;
+      pending_urbs |= 1 << URB_DATA_OUT;
+      continue;
+    }
+    if (g_exit && !abort_sent) {
+      memset(&pkt_out, 0, sizeof(pkt_out));
+      pkt_out.type = PKT_STREAM_ABORT;
+
+      ret = submit_urb(dev.fd, &urb[URB_DATA_OUT], dev.ifaces[0].ep_out,
+                       &pkt_out, sizeof(pkt_out));
+      if (ret != 0) {
+        perror("USBDEVFS_SUBMITURB PKT_STREAM_ABORT");
         break;
       }
+      pending_urbs |= 1 << URB_DATA_OUT;
+      abort_sent = 1;
+      continue;
     }
 
     continue;
@@ -759,6 +1098,28 @@ dev_close:
 
   enable_echo(1);
 
+  if (outf != NULL)
+    fclose(outf);
+  if (logf != NULL)
+    fclose(logf);
+
+  if (dev.fd != -1) {
+    /* deal with pending URBs */
+    if (pending_urbs & (1 << URB_DATA_IN))
+      ioctl(dev.fd, USBDEVFS_DISCARDURB, &urb[URB_DATA_IN]);
+    if (pending_urbs & (1 << URB_DBG_IN))
+      ioctl(dev.fd, USBDEVFS_DISCARDURB, &urb[URB_DBG_IN]);
+    for (i = 0; i < URB_CNT; i++) {
+      if (pending_urbs & (1 << i)) {
+        ret = ioctl(dev.fd, USBDEVFS_REAPURB, &reaped_urb);
+        if (ret != 0)
+          perror("USBDEVFS_REAPURB");
+      }
+    }
+
+    close(dev.fd);
+  }
+
   return ret;
 }