projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
doc: Remove asciidoc related files
[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 82831201c1b3ffe1e7c1ddf87470f8cb1b6dd80b..5c0de1257fbded71cda28e0d7dbaaf2fcffaba7c 100644
(file)
--- a/
ao-tools/ao-chaosread/ao-chaosread.c
+++ b/
ao-tools/ao-chaosread/ao-chaosread.c
@@
-74,7
+74,7
@@
chaoskey_match(libusb_device *dev, char *match_serial)
goto out;
}
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));
if (ret < 0) {
fprintf(stderr, "failed to get serial number: %s\n", libusb_strerror(ret));
@@
-103,7
+103,6
@@
chaoskey_open(char *serial)
int ret;
ssize_t num;
libusb_device **list;
int ret;
ssize_t num;
libusb_device **list;
- libusb_device *device = NULL;
int d;
ck = calloc(sizeof (struct chaoskey), 1);
int d;
ck = calloc(sizeof (struct chaoskey), 1);
@@
-173,16
+172,12
@@
chaoskey_close(struct chaoskey *ck)
free(ck);
}
free(ck);
}
-void
-chaoskey_transfer_callback(struct libusb_transfer *transfer)
-{
- struct chaoskey *ck = transfer->user_data;
-}
-
-#define ENDPOINT 0x86
+#define COOKED_ENDPOINT 0x85
+#define RAW_ENDPOINT 0x86
+#define FLASH_ENDPOINT 0x87
int
int
-chaoskey_read(struct chaoskey *ck, void *buffer, int len)
+chaoskey_read(struct chaoskey *ck,
int endpoint,
void *buffer, int len)
{
uint8_t *buf = buffer;
int total = 0;
{
uint8_t *buf = buffer;
int total = 0;
@@
-191,7
+186,7
@@
chaoskey_read(struct chaoskey *ck, void *buffer, int len)
int ret;
int transferred;
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;
if (ret) {
if (total)
return total;
@@
-202,7
+197,9
@@
chaoskey_read(struct chaoskey *ck, void *buffer, int len)
}
len -= transferred;
buf += transferred;
}
len -= transferred;
buf += transferred;
+ total += transferred;
}
}
+ return total;
}
static const struct option options[] = {
}
static const struct option options[] = {
@@
-210,12
+207,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 = "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)
{
{ 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);
}
exit(1);
}
@@
-233,8
+233,9
@@
main (int argc, char **argv)
int this_time;
int infinite = 0;
int bytes = 0;
int this_time;
int infinite = 0;
int bytes = 0;
+ int endpoint = RAW_ENDPOINT;
- while ((c = getopt_long(argc, argv, "s:l:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "s:l:
ibcrf
", options, NULL)) != -1) {
switch (c) {
case 's':
serial = optarg;
switch (c) {
case 's':
serial = optarg;
@@
-257,6
+258,15
@@
main (int argc, char **argv)
case 'b':
bytes = 1;
break;
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;
default:
usage(argv[0]);
break;
@@
-274,7
+284,7
@@
main (int argc, char **argv)
this_time = sizeof(buf);
if (!infinite && length < sizeof(buf))
this_time = (int) length;
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);
if (got < 0) {
perror("read");
exit(1);
@@
-283,8
+293,17
@@
main (int argc, char **argv)
int i;
for (i = 0; i < got / 2; i++)
putchar((buf[i] >> 1 & 0xff));
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);
length -= got;
}
exit(0);