diff options
| author | Lutz Mueller <lutz@users.sourceforge.net> | 2001-10-18 06:54:09 +0000 |
|---|---|---|
| committer | Lutz Mueller <lutz@users.sourceforge.net> | 2001-10-18 06:54:09 +0000 |
| commit | 20d8b98b4832b9fc621e9d1cb0f3e6d403ef6fc1 (patch) | |
| tree | fa0454beb153d6bff2b32b90869f3528c8238e72 /camlibs/sonydscf1 | |
| parent | 813d438a768ca48199d793f0a7a25a474deb6ab1 (diff) | |
| download | libgphoto2-20d8b98b4832b9fc621e9d1cb0f3e6d403ef6fc1.tar.gz | |
No need for camera->camlib_data.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@2599 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf1')
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.c | 12 | ||||
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.h | 7 |
2 files changed, 3 insertions, 16 deletions
diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 96a131f6c..092ce967c 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -160,29 +160,23 @@ static int file_list_func (CameraFilesystem *fs, const char *folder, } int camera_init (Camera *camera) { - gp_port_settings settings; - SonyStruct *b; + GPPortSettings settings; camera->functions->exit = camera_exit; -// camera->functions->capture = camera_capture; camera->functions->summary = camera_summary; camera->functions->manual = camera_manual; camera->functions->about = camera_about; - b = (SonyStruct*)malloc(sizeof(SonyStruct)); - camera->camlib_data = b; - b->dev = camera->port; - //FIXME: This won't work with several frontends. NO GLOBALS PLEASE! dev = camera->port; - gp_port_timeout_set(b->dev, 5000); + gp_port_timeout_set(camera->port, 5000); gp_port_settings_get (camera->port, &settings); settings.serial.speed = camera->port_info->speed; settings.serial.bits = 8; settings.serial.parity = 0; settings.serial.stopbits= 1; - gp_port_settings_set(b->dev, settings); + gp_port_settings_set(camera->port, settings); /* Set up the filesystem */ gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera); diff --git a/camlibs/sonydscf1/sonydscf1.h b/camlibs/sonydscf1/sonydscf1.h index 0370a2e75..f91eafce7 100644 --- a/camlibs/sonydscf1/sonydscf1.h +++ b/camlibs/sonydscf1/sonydscf1.h @@ -1,16 +1,9 @@ #ifndef __SONYDSCF1_H__ #define __SONYDSCF1_H__ -#include <gphoto2-port.h> - #define JPEG 0 #define JPEG_T 1 #define PMP 2 #define PMX 3 -typedef struct { - gp_port *dev; - gp_port_settings settings; -} SonyStruct; - #endif /* __SONYDSCF1_H__ */ |