ao-tools: Add ao-usbtrng to dump RNG data for testing
authorKeith Packard <keithp@keithp.com>
Tue, 27 Jan 2015 06:23:19 +0000 (22:23 -0800)
committerKeith Packard <keithp@keithp.com>
Tue, 27 Jan 2015 06:23:19 +0000 (22:23 -0800)
ao-usbtrng reads a specified number of kilobytes of random data from
a random number generator.

Signed-off-by: Keith Packard <keithp@keithp.com>
ao-tools/Makefile.am
ao-tools/ao-usbtrng/.gitignore [new file with mode: 0644]
ao-tools/ao-usbtrng/Makefile.am [new file with mode: 0644]
ao-tools/ao-usbtrng/ao-usbtrng.1 [new file with mode: 0644]
ao-tools/ao-usbtrng/ao-usbtrng.c [new file with mode: 0644]
configure.ac

index 769c470b77a7ff75ce70b385b719a14f5387db06..6a170cbdc7e1c4e6861a85facac6a66c8cf70cf5 100644 (file)
@@ -2,7 +2,7 @@ SUBDIRS=lib ao-rawload ao-dbg ao-bitbang ao-eeprom ao-list \
        ao-load ao-telem ao-send-telem ao-sky-flash \
        ao-dumpflash ao-edit-telem ao-dump-up ao-elftohex \
        ao-flash ao-usbload ao-test-igniter ao-test-baro \
        ao-load ao-telem ao-send-telem ao-sky-flash \
        ao-dumpflash ao-edit-telem ao-dump-up ao-elftohex \
        ao-flash ao-usbload ao-test-igniter ao-test-baro \
-       ao-test-flash ao-cal-accel ao-test-gps
+       ao-test-flash ao-cal-accel ao-test-gps ao-usbtrng
 if LIBSTLINK
 SUBDIRS += ao-stmload
 endif
 if LIBSTLINK
 SUBDIRS += ao-stmload
 endif
diff --git a/ao-tools/ao-usbtrng/.gitignore b/ao-tools/ao-usbtrng/.gitignore
new file mode 100644 (file)
index 0000000..54833a2
--- /dev/null
@@ -0,0 +1 @@
+ao-usbtrng
diff --git a/ao-tools/ao-usbtrng/Makefile.am b/ao-tools/ao-usbtrng/Makefile.am
new file mode 100644 (file)
index 0000000..5cbab5c
--- /dev/null
@@ -0,0 +1,11 @@
+bin_PROGRAMS=ao-usbtrng
+
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBUSB_CFLAGS)
+
+ao_usbtrng_DEPENDENCIES = $(top_builddir)/ao-tools/lib/libao-tools.a
+
+ao_usbtrng_LDADD=$(top_builddir)/ao-tools/lib/libao-tools.a $(LIBUSB_LIBS)
+
+ao_usbtrng_SOURCES=ao-usbtrng.c
+
+man_MANS = ao-usbtrng.1
diff --git a/ao-tools/ao-usbtrng/ao-usbtrng.1 b/ao-tools/ao-usbtrng/ao-usbtrng.1
new file mode 100644 (file)
index 0000000..7a1311b
--- /dev/null
@@ -0,0 +1,58 @@
+.\"
+.\" Copyright © 2009 Keith Packard <keithp@keithp.com>
+.\"
+.\" 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; 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
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+.\" General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License along
+.\" with this program; if not, write to the Free Software Foundation, Inc.,
+.\" 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+.\"
+.\"
+.TH AO-LOAD 1 "ao-usbtrng" ""
+.SH NAME
+ao-usbtrng \- dump random numbers from USBtrng
+.SH SYNOPSIS
+.B "ao-usbtrng"
+[\-T \fItty-device\fP]
+[\--tty \fItty-device\fP]
+[\-D \fIaltos-device\fP]
+[\--device \fIaltos-device\fP]
+\fIkbytes\fP
+.SH DESCRIPTION
+.I ao-usbtrng
+dumps random numbers from a USBtrng device
+.SH OPTIONS
+.TP
+\-T tty-device | --tty tty-device
+This selects which tty device the debugger uses to communicate with
+the target device. The special name 'BITBANG' directs ao-dbg to use
+the cp2103 connection, otherwise this should be a usb serial port
+connected to a suitable cc1111 debug node.
+.TP
+\-D AltOS-device | --device AltOS-device
+Search for a connected device. This requires an argument of one of the
+following forms:
+.IP
+usbtrng:2
+.br
+usbtrng
+.br
+2
+.IP
+Leaving out the product name will cause the tool to select a suitable
+product, leaving out the serial number will cause the tool to match
+one of the available devices.
+.SH USAGE
+.I ao-usbtrng
+opens the target device and reads the specified number of kbytes of
+random data.
+.SH AUTHOR
+Keith Packard
diff --git a/ao-tools/ao-usbtrng/ao-usbtrng.c b/ao-tools/ao-usbtrng/ao-usbtrng.c
new file mode 100644 (file)
index 0000000..232f4e3
--- /dev/null
@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2014 Keith Packard <keithp@keithp.com>
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <gelf.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <unistd.h>
+#include <getopt.h>
+#include <string.h>
+#include <stdbool.h>
+#include "ao-elf.h"
+#include "ccdbg.h"
+#include "cc-usb.h"
+#include "cc.h"
+#include "ao-verbose.h"
+
+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' },
+       { 0, 0, 0, 0},
+};
+
+static void usage(char *program)
+{
+       fprintf(stderr, "usage: %s [--verbose=<verbose>] [--device=<device>] [-tty=<tty>] <kbytes>\n", program);
+       exit(1);
+}
+
+void
+done(struct cc_usb *cc, int code)
+{
+       cc_usb_close(cc);
+       exit (code);
+}
+
+int
+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;
+       uint8_t                 bits[1024];
+
+       while ((c = getopt_long(argc, argv, "rT:D:c:s:v:", options, NULL)) != -1) {
+               switch (c) {
+               case 'T':
+                       tty = optarg;
+                       break;
+               case 'D':
+                       device = optarg;
+                       break;
+               case 'v':
+                       verbose++;
+                       break;
+               default:
+                       usage(argv[0]);
+                       break;
+               }
+       }
+
+       if (!argv[optind])
+               usage(argv[0]);
+
+       kbytes = atoi(argv[optind]);
+       if (kbytes < 1)
+               kbytes = 1;
+
+       ao_verbose = verbose;
+
+       if (verbose > 1)
+               ccdbg_add_debug(CC_DEBUG_BITBANG);
+
+       if (!tty)
+               tty = cc_usbdevs_find_by_arg(device, "usbtrng");
+       if (!tty)
+               tty = getenv("ALTOS_TTY");
+       if (!tty)
+               tty="/dev/ttyACM0";
+
+       cc = cc_usb_open(tty);
+
+       if (!cc)
+               exit(1);
+
+       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);
+       }
+
+       done(cc, ret);
+}
index 2c7b19c52d2b5e0d472a85ff4587747337d4c6df..5186016bfa12143be29a1c6b40b9f31a4110cbe6 100644 (file)
@@ -552,6 +552,7 @@ ao-tools/ao-test-baro/Makefile
 ao-tools/ao-test-flash/Makefile
 ao-tools/ao-cal-accel/Makefile
 ao-tools/ao-test-gps/Makefile
 ao-tools/ao-test-flash/Makefile
 ao-tools/ao-cal-accel/Makefile
 ao-tools/ao-test-gps/Makefile
+ao-tools/ao-usbtrng/Makefile
 ao-utils/Makefile
 src/Version
 ])
 ao-utils/Makefile
 src/Version
 ])