X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2Ffind_all.c;h=4a70650004284347163ce4840443dc125135772d;hp=9cfa4c6a7a8656d2c23dc75221bccf46845b478a;hb=19f1452cde9bfe9da0e2830af128fae958ae877a;hpb=9ecfef2aec5069eaefa3648e07fe58cbb02152fa

diff --git a/examples/find_all.c b/examples/find_all.c
index 9cfa4c6..4a70650 100644
--- a/examples/find_all.c
+++ b/examples/find_all.c
@@ -6,37 +6,49 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <ftdi.h>
 
-int main(int argc, char **argv)
+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;
 
-    ftdi_init(&ftdic);
-
-    if((ret = ftdi_usb_find_all(&ftdic, &devlist, 0x0403, 0x6001)) < 0) {
-        fprintf(stderr, "ftdi_usb_find_all failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
+    if ((ftdi = ftdi_new()) == 0)
+    {
+        fprintf(stderr, "ftdi_new failed\n");
         return EXIT_FAILURE;
     }
 
+    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(ftdi));
+        retval =  EXIT_FAILURE;
+        goto do_deinit;
+    }
+
     printf("Number of FTDI devices found: %d\n", ret);
 
     i = 0;
-    for (curdev = devlist; curdev != NULL; i++) {
+    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) {
-            fprintf(stderr, "ftdi_usb_get_strings failed: %d (%s)\n", ret, ftdi_get_error_string(&ftdic));
-            return EXIT_FAILURE;
+        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(ftdi));
+            retval = EXIT_FAILURE;
+            goto done;
         }
         printf("Manufacturer: %s, Description: %s\n\n", manufacturer, description);
         curdev = curdev->next;
     }
-
+done:
     ftdi_list_free(&devlist);
-    ftdi_deinit(&ftdic);
+do_deinit:
+    ftdi_free(ftdi);
 
-    return EXIT_SUCCESS;
+    return retval;
 }