From cf6e3020897bd30fe4d27270de4adbba8a51e1f8 Mon Sep 17 00:00:00 2001 From: Kolja Waschk Date: Tue, 13 May 2008 06:27:42 +0000 Subject: [PATCH] Parse VID/PID as hex, fix 1962628 git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1229 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- jtag/ChangeLog | 5 +++++ jtag/src/tap/cable/generic_usbconn.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jtag/ChangeLog b/jtag/ChangeLog index da656874..11bead17 100644 --- a/jtag/ChangeLog +++ b/jtag/ChangeLog @@ -1,3 +1,8 @@ +2008-05-13 Kolja Waschk + + * src/tap/cable/generic_usbconn.c: Read VID/PID as hexadecimal, fixes + Bug [1962628] VID/PID for usbconn cables are parsed as decimal + 2008-05-12 Kolja Waschk * doc/jtag.1: Explanation of [file] argument, correct location diff --git a/jtag/src/tap/cable/generic_usbconn.c b/jtag/src/tap/cable/generic_usbconn.c index 4e62dbe2..8fd2b70f 100644 --- a/jtag/src/tap/cable/generic_usbconn.c +++ b/jtag/src/tap/cable/generic_usbconn.c @@ -87,11 +87,11 @@ generic_usbconn_connect( char *params[], cable_t *cable ) { if(strncasecmp("pid=", params[i], 4) == 0) { - user_specified.pid = strtol( params[i] + 4, NULL, 10 ); + user_specified.pid = strtol( params[i] + 4, NULL, 16 ); } else if(strncasecmp("vid=", params[i], 4) == 0) { - user_specified.vid = strtol( params[i] + 4, NULL, 10 ); + user_specified.vid = strtol( params[i] + 4, NULL, 16 ); } else if(strncasecmp("desc=", params[i], 5) == 0) {