From 36197a388a9ba1d1ee4acd96ac0079ad3af9d3d0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 18 Dec 2013 12:15:22 -0800 Subject: libaltos: fix test harness main type Signed-off-by: Keith Packard --- libaltos/cjnitest.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libaltos') diff --git a/libaltos/cjnitest.c b/libaltos/cjnitest.c index f0fe78f7..3a65c3d6 100644 --- a/libaltos/cjnitest.c +++ b/libaltos/cjnitest.c @@ -10,7 +10,8 @@ altos_puts(struct altos_file *file, char *string) altos_putchar(file, c); } -main () +int +main (int argc, char **argv) { struct altos_device device; struct altos_list *list; -- cgit v1.2.3 From 0484ca97828da0d56be7bf395fa4a4b09c591e02 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 18 Dec 2013 12:15:54 -0800 Subject: libaltos: remove usb id filtering from darwin code Signed-off-by: Keith Packard --- libaltos/libaltos.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'libaltos') diff --git a/libaltos/libaltos.c b/libaltos/libaltos.c index 4a6363ed..a623d5ae 100644 --- a/libaltos/libaltos.c +++ b/libaltos/libaltos.c @@ -53,6 +53,8 @@ altos_get_last_error(struct altos_error *error) #ifdef DARWIN +#include + #undef USE_POLL /* Mac OS X don't have strndup even if _GNU_SOURCE is defined */ @@ -887,15 +889,6 @@ altos_list_next(struct altos_list *list, struct altos_device *device) if (!get_number (object, CFSTR(kUSBVendorID), &device->vendor) || !get_number (object, CFSTR(kUSBProductID), &device->product)) continue; - if (list->ftdi) { - if (device->vendor != 0x0403) - continue; - } else { - if (device->vendor != 0xfffe) - continue; - if (device->product < 0x000a || 0x0013 < device->product) - continue; - } if (get_string (object, CFSTR("IOCalloutDevice"), device->path, sizeof (device->path)) && get_string (object, CFSTR("USB Product Name"), device->name, sizeof (device->name)) && get_string (object, CFSTR("USB Serial Number"), serial_string, sizeof (serial_string))) { -- cgit v1.2.3 From f2e589c59ed0a4c586c5accca8772df15010c46a Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Wed, 18 Dec 2013 12:16:55 -0800 Subject: libaltos: Import newly build libaltos.dylib --- libaltos/libaltos.dylib | Bin 41596 -> 41596 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'libaltos') diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib index cfbd3f54..8b491c58 100755 Binary files a/libaltos/libaltos.dylib and b/libaltos/libaltos.dylib differ -- cgit v1.2.3