Added continuous output option to ao-usbtrng

[fw/altos] / ao-tools / ao-usbtrng / ao-usbtrng.c

diff --git a/ao-tools/ao-usbtrng/ao-usbtrng.c b/ao-tools/ao-usbtrng/ao-usbtrng.c
index 232f4e3e6a345a61e8ae1d3130cd8e92eff88a40..456885d9b4871b205d3d5cad13e8f7c2921fb7ec 100644 (file)
--- a/ao-tools/ao-usbtrng/ao-usbtrng.c
+++ b/ao-tools/ao-usbtrng/ao-usbtrng.c
@@ -35,14 +35,13 @@
 static const struct option options[] = {
        { .name = "tty", .has_arg = 1, .val = 'T' },
        { .name = "device", .has_arg = 1, .val = 'D' },
 static const struct option options[] = {
        { .name = "tty", .has_arg = 1, .val = 'T' },
        { .name = "device", .has_arg = 1, .val = 'D' },

-       { .name = "raw", .has_arg = 0, .val = 'r' },
-       { .name = "verbose", .has_arg = 1, .val = 'v' },
+       { .name = "verbose", .has_arg = 0, .val = 'v' },

        { 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
        { 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {

-       fprintf(stderr, "usage: %s [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] <kbytes>\n", program);
+       fprintf(stderr, "usage: %s [--verbose] [--device=<AltOS-device>] [-tty=<tty>] [<kbytes>]\n", program);

        exit(1);
 }
 
        exit(1);
 }
 


@@ -58,21 +57,17 @@ main (int argc, char **argv)
 {
        char                    *device = NULL;
        char                    *filename;
 {
        char                    *device = NULL;
        char                    *filename;

-       Elf                     *e;
-       unsigned int            s;

        int                     i;
        int                     c;
        int                     i;
        int                     c;

-       int                     tries;

        struct cc_usb           *cc = NULL;
        char                    *tty = NULL;
        struct cc_usb           *cc = NULL;
        char                    *tty = NULL;

-       int                     success;

        int                     verbose = 0;
        int                     ret = 0;
        int                     verbose = 0;
        int                     ret = 0;

-       int                     expected_size;
-       int                     kbytes;
+       int                     kbytes = 0; /* 0 == continuous */
+       int                     written;

        uint8_t                 bits[1024];
 
        uint8_t                 bits[1024];
 

-       while ((c = getopt_long(argc, argv, "rT:D:c:s:v:", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "vT:D:", options, NULL)) != -1) {

                switch (c) {
                case 'T':
                        tty = optarg;
                switch (c) {
                case 'T':
                        tty = optarg;


@@ -89,12 +84,8 @@ main (int argc, char **argv)
                }
        }
 
                }
        }
 

-       if (!argv[optind])
-               usage(argv[0]);
-
-       kbytes = atoi(argv[optind]);
-       if (kbytes < 1)
-               kbytes = 1;
+       if (optind < argc)
+               kbytes = atoi(argv[optind]);

 
        ao_verbose = verbose;
 
 
        ao_verbose = verbose;
 


@@ -113,13 +104,22 @@ main (int argc, char **argv)
        if (!cc)
                exit(1);
 
        if (!cc)
                exit(1);
 

-       cc_usb_printf(cc, "f %d\n", kbytes);
+       if (kbytes) {
+               cc_usb_printf(cc, "f %d\n", kbytes);

 
 

-       while (kbytes--) {
-               int     i;
-               for (i = 0; i < 1024; i++)
-                       bits[i] = cc_usb_getchar(cc);
-               write(1, bits, 1024);
+               while (kbytes--) {
+                       for (i = 0; i < 1024; i++)
+                               bits[i] = cc_usb_getchar(cc);
+                       write(1, bits, 1024);
+               }
+       } else { /* 0 == continuous */
+               written = 0;
+               while (written >= 0) {
+                       cc_usb_printf(cc, "f 1\n");
+                       for (i = 0; i < 1024; i++)
+                               bits[i] = cc_usb_getchar(cc);
+                       written = write(1, bits, 1024);
+               }

        }
 
        done(cc, ret);
        }
 
        done(cc, ret);