darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set the timeout to 3 seconds (I think)

Browse Source 
Commented out the delete command test code.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2265 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Nathan Stenzel
2001-09-17 00:04:01 +00:00
parent 9afdcbe3e0
commit af765c855c
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
camlibs/polaroid/pdc320.c
View File

@@ -194,18 +194,15 @@ pdc320_delete (CameraPort *port)
find out how many bytes to read.
* Now, let's see how many bytes it reads before it times out. : )
*/
/* CHECK_RESULT (gp_port_read (port, buf, 1));
CHECK_RESULT (gp_port_read (port, buf, 1));
CHECK_RESULT (gp_port_read (port, buf, 1));
CHECK_RESULT (gp_port_read (port, buf, 1));
*/
CHECK_RESULT (gp_port_read (port, buf, 3));
#if 0
if ((buf[0] != 0x08) ||
(buf[1] != 0xf7) ||
(buf[2] != 0xff) ||
(buf[3] != 0x09) ||
(buf[4] != 0xf6) ||
(buf[5] != 0xff) ||
(buf[6] != 0x00))
(buf[2] != 0xff))
return (GP_ERROR_CORRUPTED_DATA);
#endif
@@ -475,7 +472,7 @@ camera_init (Camera *camera)
else
settings.serial.speed = 115200;
CHECK_RESULT (gp_port_settings_set (camera->port, settings));
CHECK_RESULT (gp_port_timeout_set (camera->port, 15000));
CHECK_RESULT (gp_port_timeout_set (camera->port, 30000));
/* Check if the camera is really there */
CHECK_RESULT (pdc320_init (camera->port));
@@ -495,3 +492,4 @@ camera_init (Camera *camera)