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

diff --git a/examples/bitbang2.c b/examples/bitbang2.c
index fa588f9..f10a496 100644
--- a/examples/bitbang2.c
+++ b/examples/bitbang2.c
@@ -32,22 +32,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#ifdef __WIN32__
-#define usleep(x) Sleep((x+999)/1000)
-#endif
 #include <ftdi.h>
 
 void ftdi_fatal (struct ftdi_context *ftdi, char *str)
 {
     fprintf (stderr, "%s: %s\n",
              str, ftdi_get_error_string (ftdi));
-    ftdi_deinit(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 */
@@ -62,32 +59,31 @@ int main(int argc, char **argv)
         }
     }
 
-    if (ftdi_init(&ftdic) < 0)
+    if ((ftdi = ftdi_new()) == 0)
     {
-        fprintf(stderr, "ftdi_init failed\n");
-        ftdi_deinit(&ftdic);
+        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_set_bitmode(&ftdic, 0xFF, BITMODE_BITBANG) < 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++)
     {
         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);
 }