X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-chaosread%2Fao-chaosread.c;h=b0a6168aa71e991fc7f7e7ee86f55d299c4d2074;hp=7808f6c91d5cdad2689219951ac117ff96bc6392;hb=31f9ed231e63b214b405a141cabce3eb758e82e6;hpb=c62816a00b9aa40879a2ea98da2d10667e09b704

diff --git a/ao-tools/ao-chaosread/ao-chaosread.c b/ao-tools/ao-chaosread/ao-chaosread.c
index 7808f6c9..b0a6168a 100644
--- 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;
@@ -74,7 +74,7 @@ chaoskey_match(libusb_device *dev, char *match_serial)
 		goto out;
 	}
 
-	ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, device_serial, match_len + 1);
+	ret = libusb_get_string_descriptor_ascii(handle, desc.iSerialNumber, (unsigned char *) device_serial, match_len + 1);
 
 	if (ret < 0) {
 		fprintf(stderr, "failed to get serial number: %s\n", libusb_strerror(ret));
@@ -96,14 +96,13 @@ out:
 	return 0;
 }
 
-struct chaoskey *
+static struct chaoskey *
 chaoskey_open(char *serial)
 {
 	struct chaoskey	*ck;
 	int		ret;
 	ssize_t		num;
 	libusb_device	**list;
-	libusb_device	*device = NULL;
 	int		d;
 
 	ck = calloc(sizeof (struct chaoskey), 1);
@@ -162,27 +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);
-}
-
-void
-chaoskey_transfer_callback(struct libusb_transfer *transfer)
-{
-	struct chaoskey *ck = transfer->user_data;
-}
+#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;
@@ -191,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;
@@ -202,7 +186,9 @@ chaoskey_read(struct chaoskey *ck, void *buffer, int len)
 		}
 		len -= transferred;
 		buf += transferred;
+		total += transferred;
 	}
+	return total;
 }
 
 static const struct option options[] = {
@@ -210,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);
 }
 
@@ -233,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;
@@ -257,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;
@@ -274,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);
@@ -283,8 +282,17 @@ main (int argc, char **argv)
 			int i;
 			for (i = 0; i < got / 2; i++)
 				putchar((buf[i] >> 1 & 0xff));
-		} else
-			write(1, buf, got);
+		} else {
+			int i;
+			int ret;
+			for (i = 0; i < got; i += ret) {
+				ret = write(1, ((char *) buf) + i, got - i);
+				if (ret <= 0) {
+					perror("write");
+					exit(1);
+				}
+			}
+		}
 		length -= got;
 	}
 	exit(0);