X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2Fbitbang2.c;h=f10a496dc3bacbb35ec521c6ba5d1f72a9ea61e2;hp=64fa04a7f46c1cc357195828140731d9a62d7d56;hb=19f1452cde9bfe9da0e2830af128fae958ae877a;hpb=ad397a4bb9a5c258c8655e30f6856c0103d49a9e

diff --git a/examples/bitbang2.c b/examples/bitbang2.c
index 64fa04a..f10a496 100644
--- a/examples/bitbang2.c
+++ b/examples/bitbang2.c
@@ -1,35 +1,36 @@
 /* ftdi_out.c
  *
- * Output a (stream of) byte(s) in bitbang mode to the 
- * ftdi245 chip that is (hopefully) attached. 
+ * Output a (stream of) byte(s) in bitbang mode to the
+ * ftdi245 chip that is (hopefully) attached.
  *
- * We have a little board that has a FT245BM chip and 
- * the 8 outputs are connected to several different 
- * things that we can turn on and off with this program. 
+ * We have a little board that has a FT245BM chip and
+ * the 8 outputs are connected to several different
+ * things that we can turn on and off with this program.
  *
  * If you have an idea about hardware that can easily
  * interface onto an FTDI chip, I'd like to collect
  * ideas. If I find it worthwhile to make, I'll consider
  * making it, I'll even send you a prototype (against
  * cost-of-material) if you want.
- * 
- * At "harddisk-recovery.nl" they have a little board that 
- * controls the power to two harddrives and two fans. 
- * 
+ *
+ * At "harddisk-recovery.nl" they have a little board that
+ * controls the power to two harddrives and two fans.
+ *
  * -- REW R.E.Wolff@BitWizard.nl
  *
  *
  *
- * This program was based on libftdi_example_bitbang2232.c 
+ * This program was based on libftdi_example_bitbang2232.c
  * which doesn't carry an author or attribution header.
  *
  *
- * This program is distributed under the GPL, version 2. 
+ * This program is distributed under the GPL, version 2.
  * Millions copies of the GPL float around the internet.
  */
 
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <ftdi.h>
 
@@ -37,43 +38,52 @@ void ftdi_fatal (struct ftdi_context *ftdi, char *str)
 {
     fprintf (stderr, "%s: %s\n",
              str, ftdi_get_error_string (ftdi));
+    ftdi_free(ftdi);
     exit (1);
 }
 
 int main(int argc, char **argv)
 {
-    struct ftdi_context ftdic;
+    struct ftdi_context *ftdi;
     int i, t;
     unsigned char data;
     int delay = 100000; /* 100 thousand microseconds: 1 tenth of a second */
 
-    while ((t = getopt (argc, argv, "d:")) != -1) {
-        switch (t) {
-        case 'd':
-            delay = atoi (optarg);
-            break;
+    while ((t = getopt (argc, argv, "d:")) != -1)
+    {
+        switch (t)
+        {
+            case 'd':
+                delay = atoi (optarg);
+                break;
         }
     }
 
-    ftdi_init(&ftdic);
+    if ((ftdi = ftdi_new()) == 0)
+    {
+        fprintf(stderr, "ftdi_bew failed\n");
+        return EXIT_FAILURE;
+    }
 
-    if (ftdi_usb_open(&ftdic, 0x0403, 0x6001) < 0)
-        ftdi_fatal (&ftdic, "Can't open ftdi device");
+    if (ftdi_usb_open(ftdi, 0x0403, 0x6001) < 0)
+        ftdi_fatal (ftdi, "Can't open ftdi device");
 
-    if (ftdi_enable_bitbang(&ftdic, 0xFF) < 0)
-        ftdi_fatal (&ftdic, "Can't enable bitbang");
+    if (ftdi_set_bitmode(ftdi, 0xFF, BITMODE_BITBANG) < 0)
+        ftdi_fatal (ftdi, "Can't enable bitbang");
 
-    for (i=optind; i < argc ; i++) {
+    for (i=optind; i < argc ; i++)
+    {
         sscanf (argv[i], "%x", &t);
         data = t;
-        if(ftdi_write_data(&ftdic, &data, 1) < 0) {
+        if (ftdi_write_data(ftdi, &data, 1) < 0)
+        {
             fprintf(stderr,"write failed for 0x%x: %s\n",
-                    data, ftdi_get_error_string(&ftdic));
+                    data, ftdi_get_error_string(ftdi));
         }
         usleep(delay);
     }
 
-    ftdi_usb_close(&ftdic);
-    ftdi_deinit(&ftdic);
+    ftdi_usb_close(ftdi);
+    ftdi_free(ftdi);
     exit (0);
 }