ao-dump-up: Add --wait option to make testing µPusb easier

The --wait option hangs around until a suitable device appears, so
that you can test a pile of µPusb devices without needing to
constantly interact with the command line.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/ao-tools/ao-dump-up/ao-dump-up.c b/ao-tools/ao-dump-up/ao-dump-up.c
index 6268dc8b75b9540bc69af66059ebbc2d76b3bfcb..b1f85af63473fe2485bf33780b7f79bd244efdb5 100644 (file)
--- a/ao-tools/ao-dump-up/ao-dump-up.c
+++ b/ao-tools/ao-dump-up/ao-dump-up.c
@@ -29,12 +29,13 @@
 static const struct option options[] = {
        { .name = "tty", .has_arg = 1, .val = 'T' },
        { .name = "device", .has_arg = 1, .val = 'D' },
+       { .name = "wait", .has_arg = 0, .val = 'w' },
        { 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-       fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>]\n", program);
+       fprintf(stderr, "usage: %s [--tty <tty-name>] [--device <device-name>] [--wait]\n", program);
        exit(1);
 }
 
@@ -134,7 +135,7 @@ static int swap16(int i)
 static int find_header(struct cc_usb *cc)
 {
        for (;;) {
-               if (get_nonwhite(cc, 0) == 'M' && get_nonwhite(cc, 1000) == 'P')
+               if (get_nonwhite(cc, -1) == 'M' && get_nonwhite(cc, 1000) == 'P')
                        return 1;
        }
 }
@@ -165,9 +166,13 @@ main (int argc, char **argv)
        int             i;
        int             crc;
        int             current_crc;
+       int             wait = 0;
 
-       while ((c = getopt_long(argc, argv, "T:D:", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "wT:D:", options, NULL)) != -1) {
                switch (c) {
+               case 'w':
+                       wait = 1;
+                       break;
                case 'T':
                        tty = optarg;
                        break;
@@ -179,8 +184,21 @@ main (int argc, char **argv)
                        break;
                }
        }
-       if (!tty)
-               tty = cc_usbdevs_find_by_arg(device, "FT230X Basic UART");
+       if (!tty) {
+               for (;;) {
+                       tty = cc_usbdevs_find_by_arg(device, "FT230X Basic UART");
+                       if (tty) {
+                               if (wait) {
+                                       printf("tty is %s\n", tty);
+                                       sleep(1);
+                               }
+                               break;
+                       }
+                       if (!wait)
+                               break;
+                       sleep(1);
+               }
+       }
        if (!tty)
                tty = getenv("ALTOS_TTY");
        if (!tty)

diff --git a/ao-tools/lib/cc-usb.c b/ao-tools/lib/cc-usb.c
index 1a4dc7a1163f7460bdf139422be70d72ed44d35c..1e023c7ebe8f7b37e99eeef7b044d294a5f531dd 100644 (file)
--- a/ao-tools/lib/cc-usb.c
+++ b/ao-tools/lib/cc-usb.c
@@ -207,8 +207,10 @@ _cc_usb_sync(struct cc_usb *cc, int wait_for_input, int write_timeout)
                                        write(2, cc->in_buf, cc->in_count);
                                        cc->in_count = 0;
                                }
-                       } else if (ret < 0)
+                       } else if (ret <= 0) {
                                perror("read");
+                               return -1;
+                       }
                }
                if (fds.revents & POLLOUT) {
                        ret = write(cc->fd, cc->out_buf,