doc: add flash-force instructions for TeleBT v3.0

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

diff --git a/ao-tools/ao-chaosread/ao-chaosread.c b/ao-tools/ao-chaosread/ao-chaosread.c
index 6d860139f71487a59dbd3f9d8e6433532fa018b4..b0a6168aa71e991fc7f7e7ee86f55d299c4d2074 100644 (file)
--- a/ao-tools/ao-chaosread/ao-chaosread.c
+++ b/ao-tools/ao-chaosread/ao-chaosread.c
@@ -36,7 +36,7 @@ struct chaoskey {
        int                     kernel_active;
 };
 
-libusb_device_handle *
+static libusb_device_handle *
 chaoskey_match(libusb_device *dev, char *match_serial)
 {
        struct libusb_device_descriptor desc;
@@ -96,7 +96,7 @@ out:
        return 0;
 }
 
-struct chaoskey *
+static struct chaoskey *
 chaoskey_open(char *serial)
 {
        struct chaoskey *ck;
@@ -161,21 +161,12 @@ out:
        return NULL;
 }
 
-void
-chaoskey_close(struct chaoskey *ck)
-{
-       libusb_release_interface(ck->handle, 0);
-       if (ck->kernel_active)
-               libusb_attach_kernel_driver(ck->handle, 0);
-       libusb_close(ck->handle);
-       libusb_exit(ck->ctx);
-       free(ck);
-}
+#define COOKED_ENDPOINT        0x85
+#define RAW_ENDPOINT   0x86
+#define FLASH_ENDPOINT 0x87
 
-#define ENDPOINT       0x86
-
-int
-chaoskey_read(struct chaoskey *ck, void *buffer, int len)
+static int
+chaoskey_read(struct chaoskey *ck, int endpoint, void *buffer, int len)
 {
        uint8_t *buf = buffer;
        int     total = 0;
@@ -184,7 +175,7 @@ chaoskey_read(struct chaoskey *ck, void *buffer, int len)
                int     ret;
                int     transferred;
 
-               ret = libusb_bulk_transfer(ck->handle, ENDPOINT, buf, len, &transferred, 10000);
+               ret = libusb_bulk_transfer(ck->handle, endpoint, buf, len, &transferred, 10000);
                if (ret) {
                        if (total)
                                return total;
@@ -205,12 +196,15 @@ static const struct option options[] = {
        { .name = "length", .has_arg = 1, .val = 'l' },
        { .name = "infinite", .has_arg = 0, .val = 'i' },
        { .name = "bytes", .has_arg = 0, .val = 'b' },
+       { .name = "cooked", .has_arg = 0, .val = 'c' },
+       { .name = "raw", .has_arg = 0, .val = 'r' },
+       { .name = "flash", .has_arg = 0, .val = 'f' },
        { 0, 0, 0, 0},
 };
 
 static void usage(char *program)
 {
-       fprintf(stderr, "usage: %s [--serial=<serial>] [--length=<length>[kMG]] [--infinite] [--bytes]\n", program);
+       fprintf(stderr, "usage: %s [--serial=<serial>] [--length=<length>[kMG]] [--infinite] [--bytes] [--cooked] [--raw] [--flash]\n", program);
        exit(1);
 }
 
@@ -228,8 +222,9 @@ main (int argc, char **argv)
        int     this_time;
        int     infinite = 0;
        int     bytes = 0;
+       int     endpoint = RAW_ENDPOINT;
 
-       while ((c = getopt_long(argc, argv, "s:l:ib", options, NULL)) != -1) {
+       while ((c = getopt_long(argc, argv, "s:l:ibcrf", options, NULL)) != -1) {
                switch (c) {
                case 's':
                        serial = optarg;
@@ -252,6 +247,15 @@ main (int argc, char **argv)
                case 'b':
                        bytes = 1;
                        break;
+               case 'c':
+                       endpoint = COOKED_ENDPOINT;
+                       break;
+               case 'r':
+                       endpoint = RAW_ENDPOINT;
+                       break;
+               case 'f':
+                       endpoint = FLASH_ENDPOINT;
+                       break;
                default:
                        usage(argv[0]);
                        break;
@@ -269,7 +273,7 @@ main (int argc, char **argv)
                this_time = sizeof(buf);
                if (!infinite && length < sizeof(buf))
                        this_time = (int) length;
-               got = chaoskey_read(ck, buf, this_time);
+               got = chaoskey_read(ck, endpoint, buf, this_time);
                if (got < 0) {
                        perror("read");
                        exit(1);