fix mem leaks in examples ftdi_deinit -> ftdi_free

[libftdi] / examples / bitbang_ft2232.c

diff --git a/examples/bitbang_ft2232.c b/examples/bitbang_ft2232.c
index cc6b405..253555a 100644 (file)
--- a/examples/bitbang_ft2232.c
+++ b/examples/bitbang_ft2232.c
@@ -9,42 +9,57 @@
 */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
+#ifdef __WIN32__
+#define sleep(x) Sleep(x)
+#endif
 #include <ftdi.h>
 
 int main(int argc, char **argv)
 {
-    struct ftdi_context ftdic, ftdic2;
-    char buf[1];
+    struct ftdi_context *ftdi, *ftdi2;
+    unsigned char buf[1];
     int f,i;
 
     // Init 1. channel
-    ftdi_init(&ftdic);
-    ftdi_set_interface(&ftdic, INTERFACE_A);
-    f = ftdi_usb_open(&ftdic, 0x0403, 0x6001);
+    if ((ftdi = ftdi_new()) == 0)
+    {
+        fprintf(stderr, "ftdi_new failed\n");
+        return EXIT_FAILURE;
+    }
+
+    ftdi_set_interface(ftdi, INTERFACE_A);
+    f = ftdi_usb_open(ftdi, 0x0403, 0x6001);
     if (f < 0 && f != -5)
     {
-        fprintf(stderr, "unable to open ftdi device: %d (%s)\n", f, ftdi_get_error_string(&ftdic));
+        fprintf(stderr, "unable to open ftdi device: %d (%s)\n", f, ftdi_get_error_string(ftdi));
+        ftdi_free(ftdi);
         exit(-1);
     }
     printf("ftdi open succeeded(channel 1): %d\n",f);
 
     printf("enabling bitbang mode(channel 1)\n");
-    ftdi_enable_bitbang(&ftdic, 0xFF);
+    ftdi_set_bitmode(ftdi, 0xFF, BITMODE_BITBANG);
 
     // Init 2. channel
-    ftdi_init(&ftdic2);
-    ftdi_set_interface(&ftdic2, INTERFACE_B);
-    f = ftdi_usb_open(&ftdic2, 0x0403, 0x6001);
+    if ((ftdi2 = ftdi_new()) == 0)
+    {
+        fprintf(stderr, "ftdi_new failed\n");
+        return EXIT_FAILURE;
+    }
+    ftdi_set_interface(ftdi2, INTERFACE_B);
+    f = ftdi_usb_open(ftdi2, 0x0403, 0x6001);
     if (f < 0 && f != -5)
     {
-        fprintf(stderr, "unable to open ftdi device: %d (%s)\n", f, ftdi_get_error_string(&ftdic2));
+        fprintf(stderr, "unable to open ftdi device: %d (%s)\n", f, ftdi_get_error_string(ftdi2));
+        ftdi_free(ftdi2);
         exit(-1);
     }
     printf("ftdi open succeeded(channel 2): %d\n",f);
 
     printf("enabling bitbang mode (channel 2)\n");
-    ftdi_enable_bitbang(&ftdic2, 0xFF);
+    ftdi_set_bitmode(ftdi2, 0xFF, BITMODE_BITBANG);
 
     // Write data
     printf("startloop\n");
@@ -52,41 +67,43 @@ int main(int argc, char **argv)
     {
         buf[0] =  0x1;
         printf("porta: %02i: 0x%02x \n",i,buf[0]);
-        f = ftdi_write_data(&ftdic, buf, 1);
+        f = ftdi_write_data(ftdi, buf, 1);
         if (f < 0)
-            fprintf(stderr,"write failed on channel 1 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(&ftdic));
+            fprintf(stderr,"write failed on channel 1 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(ftdi));
         sleep(1);
 
         buf[0] =  0x2;
         printf("porta: %02i: 0x%02x \n",i,buf[0]);
-        f = ftdi_write_data(&ftdic, buf, 1);
+        f = ftdi_write_data(ftdi, buf, 1);
         if (f < 0)
-            fprintf(stderr,"write failed on channel 1 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(&ftdic));
+            fprintf(stderr,"write failed on channel 1 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(ftdi));
         sleep(1);
 
         buf[0] =  0x1;
         printf("portb: %02i: 0x%02x \n",i,buf[0]);
-        f = ftdi_write_data(&ftdic2, buf, 1);
+        f = ftdi_write_data(ftdi2, buf, 1);
         if (f < 0)
-            fprintf(stderr,"write failed on channel 2 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(&ftdic2));
+            fprintf(stderr,"write failed on channel 2 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(ftdi2));
         sleep(1);
 
         buf[0] =  0x2;
         printf("portb: %02i: 0x%02x \n",i,buf[0]);
-        f = ftdi_write_data(&ftdic2, buf, 1);
+        f = ftdi_write_data(ftdi2, buf, 1);
         if (f < 0)
-            fprintf(stderr,"write failed on channel 2 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(&ftdic2));
+            fprintf(stderr,"write failed on channel 2 for 0x%x, error %d (%s)\n", buf[0], f, ftdi_get_error_string(ftdi2));
         sleep(1);
     }
     printf("\n");
 
     printf("disabling bitbang mode(channel 1)\n");
-    ftdi_disable_bitbang(&ftdic);
-    ftdi_usb_close(&ftdic);
-    ftdi_deinit(&ftdic);
+    ftdi_disable_bitbang(ftdi);
+    ftdi_usb_close(ftdi);
+    ftdi_free(ftdi);
 
     printf("disabling bitbang mode(channel 2)\n");
-    ftdi_disable_bitbang(&ftdic2);
-    ftdi_usb_close(&ftdic2);
-    ftdi_deinit(&ftdic2);
+    ftdi_disable_bitbang(ftdi2);
+    ftdi_usb_close(ftdi2);
+    ftdi_free(ftdi2);
+
+    return 0;
 }