diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-18 18:25:35 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-18 18:25:35 -0700 |
| commit | d9982c257463f23be940eea66bd4dc3aadff0043 (patch) | |
| tree | a4744aa4f82b6e9a0a7d019c4112516191aed7c8 /libaltos | |
| parent | 1b97ed2b64bcbcd969124964f1e49837899f1c70 (diff) | |
| parent | b63fc05481bf6d57e6385704ce53c1c19afa9c2e (diff) | |
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
Diffstat (limited to 'libaltos')
| -rw-r--r-- | libaltos/cjnitest.c | 3 | ||||
| -rw-r--r-- | libaltos/libaltos.c | 11 | ||||
| -rwxr-xr-x | libaltos/libaltos.dylib | bin | 41596 -> 41596 bytes |
3 files changed, 4 insertions, 10 deletions
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; 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 <unistd.h> + #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))) { diff --git a/libaltos/libaltos.dylib b/libaltos/libaltos.dylib Binary files differindex cfbd3f54..8b491c58 100755 --- a/libaltos/libaltos.dylib +++ b/libaltos/libaltos.dylib |