From: <mar...@us...> - 2011-03-05 17:34:47
|
Revision: 13556 http://gphoto.svn.sourceforge.net/gphoto/?rev=13556&view=rev Author: marcusmeissner Date: 2011-03-05 17:34:40 +0000 (Sat, 05 Mar 2011) Log Message: ----------- make default "fast timeout" 100, as 50 ms were not enough for the Nikon D3100 Modified Paths: -------------- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/usb.c Modified: branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/usb.c =================================================================== --- branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/usb.c 2011-03-01 15:58:49 UTC (rev 13555) +++ branches/libgphoto2-2_4/libgphoto2/camlibs/ptp2/usb.c 2011-03-05 17:34:40 UTC (rev 13556) @@ -61,7 +61,7 @@ /* PTP2_FAST_TIMEOUT: how long (in milliseconds) we should wait for * an URB to come back on an interrupt endpoint */ -#define PTP2_FAST_TIMEOUT 50 +#define PTP2_FAST_TIMEOUT 100 /* Pack / unpack functions */ @@ -493,7 +493,7 @@ Camera *camera = ((PTPData *)params->data)->camera; if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_CANON) - fasttimeout = PTP2_FAST_TIMEOUT*4; + fasttimeout = PTP2_FAST_TIMEOUT*2; else fasttimeout = PTP2_FAST_TIMEOUT; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |