X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2Ffind_all.c;h=4a70650004284347163ce4840443dc125135772d;hp=7d1aab42c2f490543fffa0d3d2b0dce8ae5a3f92;hb=d160863c527c8a3fdf1e821a64c59192a2fc2150;hpb=4cc3fa8a4675e46b8cf8b200175a28dd7fc027ca diff --git a/examples/find_all.c b/examples/find_all.c index 7d1aab4..4a70650 100644 --- a/examples/find_all.c +++ b/examples/find_all.c @@ -12,22 +12,21 @@ int main(void) { int ret, i; - struct ftdi_context ftdic; + struct ftdi_context *ftdi; struct ftdi_device_list *devlist, *curdev; char manufacturer[128], description[128]; int retval = EXIT_SUCCESS; - if (ftdi_init(&ftdic) < 0) + if ((ftdi = ftdi_new()) == 0) { - fprintf(stderr, "ftdi_init failed\n"); + fprintf(stderr, "ftdi_new failed\n"); return EXIT_FAILURE; } - if ((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6001)) < 0) + if ((ret = ftdi_usb_find_all(ftdi, &devlist, 0, 0)) < 0) { - fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); + fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, ftdi_get_error_string(ftdi)); retval = EXIT_FAILURE; - return retval; goto do_deinit; } @@ -37,11 +36,10 @@ int main(void) for (curdev = devlist; curdev != NULL; i++) { printf("Checking device: %d\n", i); - if ((ret = ftdi_usb_get_strings(&ftdic, curdev->dev, manufacturer, 128, description, 128, NULL, 0)) < 0) + if ((ret = ftdi_usb_get_strings(ftdi, curdev->dev, manufacturer, 128, description, 128, NULL, 0)) < 0) { - fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic)); + fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, ftdi_get_error_string(ftdi)); retval = EXIT_FAILURE; - return retval; goto done; } printf("Manufacturer: %s, Description: %s\n\n", manufacturer, description); @@ -50,7 +48,7 @@ int main(void) done: ftdi_list_free(&devlist); do_deinit: - ftdi_deinit(&ftdic); + ftdi_free(ftdi); - return EXIT_SUCCESS; + return retval; }