X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=examples%2Fbaud_test.c;h=d8d4886154c05907962d3a1375abac8796c92465;hp=f6bcac9e6fe35e20d38a154c115ba53999fe7482;hb=05c2e40a3c720c63a75d36a33d0d5de0677f8f57;hpb=f44dbec230aaa0835be8be7d4581394ed4a92435

diff --git a/examples/baud_test.c b/examples/baud_test.c
index f6bcac9..d8d4886 100644
--- a/examples/baud_test.c
+++ b/examples/baud_test.c
@@ -3,10 +3,16 @@
  * test setting the baudrate and compare it with the expected runtime
  *
  * options:
- *  -p <usb-product-id> (vendor is fixed to ftdi / 0x0403)
+ *  -p <devicestring> defaults to "i:0x0403:0x6001" (this is the first FT232R with default id)
+ *       d:<devicenode> path of bus and device-node (e.g. "003/001") within usb device tree (usually at /proc/bus/usb/)
+ *       i:<vendor>:<product> first device with given vendor and product id,
+ *                            ids can be decimal, octal (preceded by "0") or hex (preceded by "0x")
+ *       i:<vendor>:<product>:<index> as above with index being the number of the device (starting with 0)
+ *                            if there are more than one
+ *       s:<vendor>:<product>:<serial> first device with given vendor id, product id and serial string
  *  -d <datasize to send in bytes>
  *  -b <baudrate> (divides by 16 if bitbang as taken from the ftdi datasheets)
- *  -m <mode to use> r: serial a: async bitbang s:sync bitbang 
+ *  -m <mode to use> r: serial a: async bitbang s:sync bitbang
  *  -c <chunksize>
  *
  * (C) 2009 by Gerd v. Egidy <gerd.von.egidy@intra2net.com>
@@ -25,6 +31,7 @@
 
 #include <sys/time.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <ftdi.h>
 
@@ -32,7 +39,7 @@ double get_prec_time()
 {
     struct timeval tv;
     double res;
-    
+
     gettimeofday(&tv,NULL);
 
     res=tv.tv_sec;
@@ -45,18 +52,20 @@ int main(int argc, char **argv)
 {
     struct ftdi_context ftdic;
     int i, t;
-    char *txbuf;
-    char *rxbuf;
+    unsigned char *txbuf;
+    unsigned char *rxbuf;
     double start, duration, plan;
 
     // default values
     int baud=9600;
     int set_baud;
     int datasize=100000;
-    int product_id=0x6001;
+
+    char default_devicedesc[] = "i:0x0403:0x6001";
+    char *devicedesc=default_devicedesc;
     int txchunksize=256;
     enum ftdi_mpsse_mode test_mode=BITMODE_BITBANG;
-    
+
     while ((t = getopt (argc, argv, "b:d:p:m:c:")) != -1)
     {
         switch (t)
@@ -65,7 +74,7 @@ int main(int argc, char **argv)
                 datasize = atoi (optarg);
                 break;
             case 'm':
-                switch(*optarg)
+                switch (*optarg)
                 {
                     case 'r':
                         // serial
@@ -85,7 +94,7 @@ int main(int argc, char **argv)
                 baud = atoi (optarg);
                 break;
             case 'p':
-                sscanf(optarg,"0x%x",&product_id);
+                devicedesc=optarg;
                 break;
             case 'c':
                 txchunksize = atoi (optarg);
@@ -107,7 +116,7 @@ int main(int argc, char **argv)
         return EXIT_FAILURE;
     }
 
-    if (ftdi_usb_open(&ftdic, 0x0403, product_id) < 0)
+    if (ftdi_usb_open_string(&ftdic, devicedesc) < 0)
     {
         fprintf(stderr,"Can't open ftdi device: %s\n",ftdi_get_error_string(&ftdic));
         return EXIT_FAILURE;
@@ -153,22 +162,26 @@ int main(int argc, char **argv)
     }
 
     if (ftdi_write_data_set_chunksize(&ftdic, txchunksize) < 0 ||
-        ftdi_read_data_set_chunksize(&ftdic, txchunksize) < 0)
+            ftdi_read_data_set_chunksize(&ftdic, txchunksize) < 0)
     {
         fprintf(stderr,"Can't set chunksize: %s\n",ftdi_get_error_string(&ftdic));
         return EXIT_FAILURE;
     }
 
-    if(test_mode==BITMODE_SYNCBB)
+    if (test_mode==BITMODE_SYNCBB)
     {
         // completely clear the receive buffer before beginning
-        while(ftdi_read_data(&ftdic, rxbuf, txchunksize)>0);
+        while (ftdi_read_data(&ftdic, rxbuf, txchunksize)>0);
     }
 
     start=get_prec_time();
 
+    // don't wait for more data to arrive, take what we get and keep on sending
+    // yes, we really would like to have libusb 1.0+ with async read/write...
+    ftdic.usb_read_timeout=1;
+
     i=0;
-    while(i < datasize)
+    while (i < datasize)
     {
         int sendsize=txchunksize;
         if (i+sendsize > datasize)
@@ -183,15 +196,15 @@ int main(int argc, char **argv)
 
         i+=sendsize;
 
-        if(test_mode==BITMODE_SYNCBB)
+        if (test_mode==BITMODE_SYNCBB)
         {
             // read the same amount of data as sent
-            ftdi_read_data(&ftdic, rxbuf, txchunksize);
+            ftdi_read_data(&ftdic, rxbuf, sendsize);
         }
     }
 
     duration=get_prec_time()-start;
-    printf("and took %.4f seconds, this is factor %.3f\n",duration,plan/duration);
+    printf("and took %.4f seconds, this is %.0f baud or factor %.3f\n",duration,(plan*baud)/duration,plan/duration);
 
     ftdi_usb_close(&ftdic);
     ftdi_deinit(&ftdic);