git://developer.intra2net.com
/
libftdi
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(from parent 1:
80d3cf7
)
Revert "Fixes the three open methods of the cpp wrapper that do not get an usb-device...
author
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Mon, 16 Jan 2012 14:26:01 +0000 (15:26 +0100)
committer
Thomas Jarosch
<thomas.jarosch@intra2net.com>
Mon, 16 Jan 2012 14:26:01 +0000 (15:26 +0100)
This reverts commit
80d3cf70870aa4d1c8125bdf7ca00552b8a1ab57
.
Old version of the fix - not supposed to be commited.
ftdipp/ftdi.cpp
patch
|
blob
|
blame
|
history
diff --git
a/ftdipp/ftdi.cpp
b/ftdipp/ftdi.cpp
index
5868405
..
8511a91
100644
(file)
--- a/
ftdipp/ftdi.cpp
+++ b/
ftdipp/ftdi.cpp
@@
-85,8
+85,6
@@
int Context::open(int vendor, int product)
if (ret < 0)
return ret;
- d->dev = usb_device(d->ftdi->usb_dev);
-
return get_strings_and_reopen();
}
@@
-106,8
+104,6
@@
int Context::open(int vendor, int product, const std::string& description, const
if (ret < 0)
return ret;
- d->dev = usb_device(d->ftdi->usb_dev);
-
return get_strings_and_reopen();
}
@@
-118,8
+114,6
@@
int Context::open(const std::string& description)
if (ret < 0)
return ret;
- d->dev = usb_device(d->ftdi->usb_dev);
-
return get_strings_and_reopen();
}