Make streamtest work on allocated structure

[Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>]

Applies to both branches
-- 
Uwe Bonnes                bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx

Institut fuer Kernphysik  Schlossgartenstrasse 9  64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
>From b9ae6e67bd5daeb1458b96a81419c10f5d8e8dae Mon Sep 17 00:00:00 2001
From: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue, 1 Feb 2011 10:51:55 +0100
Subject: Work on allocated ftdi structure

---
 examples/stream_test.c |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/examples/stream_test.c b/examples/stream_test.c
index ba14c02..21b1a11 100644
--- a/examples/stream_test.c
+++ b/examples/stream_test.c
@@ -137,7 +137,7 @@ readCallback(uint8_t *buffer, int length, FTDIProgressInfo 
*progress, void *user
 
 int main(int argc, char **argv)
 {
-    struct ftdi_context ftdic;
+    struct ftdi_context *ftdi;
     int err, c;
     FILE *of = NULL;
     char const *outfile  = 0;
@@ -176,22 +176,23 @@ int main(int argc, char **argv)
         // Too many extra args
         usage(argv[0]);
     }
+    ftdi = ftdi_new();
 
-    if (ftdi_init(&ftdic) < 0)
+    if (ftdi == NULL)
     {
-        fprintf(stderr, "ftdi_init failed\n");
+        fprintf(stderr, "ftdi_new failed\n");
         return EXIT_FAILURE;
     }
 
-    if (ftdi_set_interface(&ftdic, INTERFACE_A) < 0)
+    if (ftdi_set_interface(ftdi, INTERFACE_A) < 0)
     {
         fprintf(stderr, "ftdi_set_interface failed\n");
         return EXIT_FAILURE;
     }
 
-    if (ftdi_usb_open_desc(&ftdic, 0x0403, 0x6010, descstring, serial) < 0)
+    if (ftdi_usb_open_desc(ftdi, 0x0403, 0x6010, descstring, serial) < 0)
     {
-        fprintf(stderr,"Can't open ftdi device: 
%s",ftdi_get_error_string(&ftdic));
+        fprintf(stderr,"Can't open ftdi device: 
%s",ftdi_get_error_string(ftdi));
         if (descstring)
             fprintf(stderr,"with Description: %s",descstring);
         if (descstring)
@@ -201,15 +202,15 @@ int main(int argc, char **argv)
     }
 
     /* A timeout value of 1 results in may skipped blocks */
-    if (ftdi_set_latency_timer(&ftdic, 2))
+    if (ftdi_set_latency_timer(ftdi, 2))
     {
-        fprintf(stderr,"Can't set latency, Error 
%s\n",ftdi_get_error_string(&ftdic));
+        fprintf(stderr,"Can't set latency, Error 
%s\n",ftdi_get_error_string(ftdi));
         return EXIT_FAILURE;
     }
 
-    /*   if(ftdi_usb_purge_rx_buffer(&ftdic) < 0)
+    /*   if(ftdi_usb_purge_rx_buffer(ftdi) < 0)
        {
-           fprintf(stderr,"Can't rx purge\n",ftdi_get_error_string(&ftdic));
+           fprintf(stderr,"Can't rx purge\n",ftdi_get_error_string(ftdi));
            return EXIT_FAILURE;
            }*/
     if (outfile && (!(strcasecmp(outfile,"stdout"))))
@@ -222,7 +223,7 @@ int main(int argc, char **argv)
             outputFile = of;
     signal(SIGINT, sigintHandler);
 
-    err = ftdi_readstream(&ftdic, readCallback, NULL, 8, 256);
+    err = ftdi_readstream(ftdi, readCallback, NULL, 8, 256);
     if (err < 0 && !exitRequested)
         exit(1);
 
@@ -233,13 +234,13 @@ int main(int argc, char **argv)
     }
     fprintf(stderr, "Capture ended.\n");
 
-    if (ftdi_set_bitmode(&ftdic,  0xff, BITMODE_RESET) < 0)
+    if (ftdi_set_bitmode(ftdi,  0xff, BITMODE_RESET) < 0)
     {
-        fprintf(stderr,"Can't set synchronous fifo mode, Error 
%s\n",ftdi_get_error_string(&ftdic));
+        fprintf(stderr,"Can't set synchronous fifo mode, Error 
%s\n",ftdi_get_error_string(ftdi));
         return EXIT_FAILURE;
     }
-    ftdi_usb_close(&ftdic);
-    ftdi_deinit(&ftdic);
+    ftdi_usb_close(ftdi);
+    ftdi_free(ftdi);
     signal(SIGINT, SIG_DFL);
     if (check && outfile)
     {
-- 
1.7.1


--
libftdi - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx