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

2001-09-10 Lutz M�ller <urc8@rz.uni-karlsruhe.de>

Browse Source 
* camlibs/kodak/dc240/dc240.c (camera_init): Don't open/close the port.
        This is done by libgphoto2.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2223 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Lutz Mueller
2001-09-10 16:40:41 +00:00
parent 9c7eff54fe
commit 2536cce23f
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,3 +1,8 @@
2001-09-10 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* camlibs/kodak/dc240/dc240.c (camera_init): Don't open/close the port.
This is done by libgphoto2.
2001-09-10 Lutz Müller <urc8@rz.uni-karlsruhe.de>
* libgphoto2/camera.c

18
camlibs/kodak/dc240/dc240.c
View File

@@ -196,10 +196,6 @@ camera_init (Camera *camera)
if (ret < 0)
return (ret);
ret = gp_port_open (camera->port);
if (ret < 0)
return (ret);
ret = gp_port_timeout_set (camera->port, TIMEOUT);
if (ret < 0)
return (ret);
@@ -212,24 +208,18 @@ camera_init (Camera *camera)
GP_SYSTEM_SLEEP(1500);
ret = dc240_set_speed (camera, camera->port_info->speed);
if (ret < 0) {
gp_port_close (camera->port);
if (ret < 0)
return (ret);
}
}
/* Open the CF card */
ret = dc240_open (camera);
if (ret < 0) {
gp_port_close (camera->port);
if (ret < 0)
return (ret);
}
ret = dc240_packet_set_size (camera, HPBS+2);
if (ret < 0) {
gp_port_close (camera->port);
if (ret < 0)
return (ret);
}
return (GP_OK);
}