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

diff --git a/examples/bitbang_cbus.c b/examples/bitbang_cbus.c
index f47c359..b902b50 100644
--- a/examples/bitbang_cbus.c
+++ b/examples/bitbang_cbus.c
@@ -36,24 +36,23 @@
 
 int main(void)
 {
-    struct ftdi_context ftdic;
+    struct ftdi_context *ftdi;
     int f;
     unsigned char buf[1];
     unsigned char bitmask;
     char input[10];
-    int retval = 0;
 
-    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;
     }
 
-    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));
-        ftdi_deinit(&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);
@@ -65,31 +64,31 @@ int main(void)
         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));
-            ftdi_usb_close(&ftdic);
-            ftdi_deinit(&ftdic);
-            retval = -1;
+            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));
-            ftdi_usb_close(&ftdic);
-            ftdi_deinit(&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(&ftdic);
-    ftdi_deinit(&ftdic);
+    ftdi_usb_close(ftdi);
+    ftdi_free(ftdi);
 
     return 0;
 }