X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-usbtrng%2Fao-usbtrng.c;h=0362f1b46af98560dc220181e36afa64392b9f3d;hp=232f4e3e6a345a61e8ae1d3130cd8e92eff88a40;hb=1085ec5d57e0ed5d132f2bbdac1a0b6a32c0ab4a;hpb=bf08397202860a73417cd1711012eb3e33f308c3

diff --git a/ao-tools/ao-usbtrng/ao-usbtrng.c b/ao-tools/ao-usbtrng/ao-usbtrng.c
index 232f4e3e..0362f1b4 100644
--- a/ao-tools/ao-usbtrng/ao-usbtrng.c
+++ b/ao-tools/ao-usbtrng/ao-usbtrng.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -35,14 +36,13 @@
 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)
 {
-	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);
 }
 
@@ -58,21 +58,17 @@ main (int argc, char **argv)
 {
 	char			*device = NULL;
 	char			*filename;
-	Elf			*e;
-	unsigned int		s;
 	int			i;
 	int			c;
-	int			tries;
 	struct cc_usb		*cc = NULL;
 	char			*tty = NULL;
-	int			success;
 	int			verbose = 0;
 	int			ret = 0;
-	int			expected_size;
-	int			kbytes;
+	int			kbytes = 0; /* 0 == continuous */
+	int			written;
 	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;
@@ -89,12 +85,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;
 
@@ -113,13 +105,22 @@ main (int argc, char **argv)
 	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);