X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2Fbitbang_cbus.c;h=b902b5092f3310b6c1359bcf7bd86f1c6a765552;hp=e3f2a41812cc84c6a7fc943f0d975b328d8749e6;hb=1383a2c4d1c056f3ac17ee15ed21e9aab03db1cc;hpb=22d12cda4aed8d25fb79588a7261ca489db5ecd7

diff --git a/examples/bitbang_cbus.c b/examples/bitbang_cbus.c
index e3f2a41..b902b50 100644
--- a/examples/bitbang_cbus.c
+++ b/examples/bitbang_cbus.c
@@ -34,20 +34,25 @@
 #include <stdlib.h>
 #include <ftdi.h>
 
-int main(int argc, char **argv)
+int main(void)
 {
-    struct ftdi_context ftdic;
-    int f,i;
+    struct ftdi_context *ftdi;
+    int f;
     unsigned char buf[1];
     unsigned char bitmask;
-    unsigned char input[10];
+    char input[10];
 
-    ftdi_init(&ftdic);
+    if ((ftdi = ftdi_new()) == 0)
+    {
+        fprintf(stderr, "ftdi_new failed\n");
+        return EXIT_FAILURE;
+    }
 
-    f = ftdi_usb_open(&ftdic, 0x0403, 0x6001);
+    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: %d\n",f);
@@ -59,25 +64,31 @@ int main(int argc, char **argv)
         if (input[0] == '\n') break;
         bitmask = strtol(input, NULL, 0);
         printf("Using bitmask 0x%02x\n", bitmask);
-        f = ftdi_set_bitmode(&ftdic, bitmask, BITMODE_CBUS);
+        f = ftdi_set_bitmode(ftdi, bitmask, BITMODE_CBUS);
         if (f < 0)
         {
-            fprintf(stderr, "set_bitmode failed for 0x%x, error %d (%s)\n", bitmask, f, ftdi_get_error_string(&ftdic));
+            fprintf(stderr, "set_bitmode failed for 0x%x, error %d (%s)\n", bitmask, f, ftdi_get_error_string(ftdi));
+            ftdi_usb_close(ftdi);
+            ftdi_free(ftdi);
             exit(-1);
         }
 
         // read CBUS
-        f = ftdi_read_pins(&ftdic, &buf[0]);
+        f = ftdi_read_pins(ftdi, &buf[0]);
         if (f < 0)
         {
-            fprintf(stderr, "read_pins failed, error %d (%s)\n", f, ftdi_get_error_string(&ftdic));
+            fprintf(stderr, "read_pins failed, error %d (%s)\n", f, ftdi_get_error_string(ftdi));
+            ftdi_usb_close(ftdi);
+            ftdi_free(ftdi);
             exit(-1);
         }
         printf("Read returned 0x%01x\n", buf[0] & 0x0f);
     }
     printf("disabling bitbang mode\n");
-    ftdi_disable_bitbang(&ftdic);
+    ftdi_disable_bitbang(ftdi);
+
+    ftdi_usb_close(ftdi);
+    ftdi_free(ftdi);
 
-    ftdi_usb_close(&ftdic);
-    ftdi_deinit(&ftdic);
+    return 0;
 }