From c7f06bd4d72e78415046992276fec7aa801407f2 Mon Sep 17 00:00:00 2001 From: Gerd v. Egidy Date: Sun, 13 Dec 2009 00:49:22 +0100 Subject: [PATCH] use ftdi_usb_open_string() in baud_test example --- examples/baud_test.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/baud_test.c b/examples/baud_test.c index 4a7d4d5..3116fcd 100644 --- a/examples/baud_test.c +++ b/examples/baud_test.c @@ -3,7 +3,13 @@ * test setting the baudrate and compare it with the expected runtime * * options: - * -p (vendor is fixed to ftdi / 0x0403) + * -p defaults to "i:0x0403:0x6001" (this is the first FT232R with default id) + * d: path of bus and device-node (e.g. "003/001") within usb device tree (usually at /proc/bus/usb/) + * i:: first device with given vendor and product id, + * ids can be decimal, octal (preceded by "0") or hex (preceded by "0x") + * i::: as above with index being the number of the device (starting with 0) + * if there are more than one + * s::: first device with given vendor id, product id and serial string * -d * -b (divides by 16 if bitbang as taken from the ftdi datasheets) * -m r: serial a: async bitbang s:sync bitbang @@ -53,7 +59,9 @@ int main(int argc, char **argv) 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; @@ -85,7 +93,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 +115,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; -- 1.7.1