diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2006-03-19 20:38:35 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2006-03-19 20:38:35 +0000 |
| commit | 278937a9b5406e110ecd8b526d5538ffb40d470b (patch) | |
| tree | 112274284558da8045c32c5b0c4a6fc3582567bb /camlibs/sipix | |
| parent | 8d2d9dd113e7c90d2872fe6239def5a08eea63dd (diff) | |
| download | libgphoto2-278937a9b5406e110ecd8b526d5538ffb40d470b.tar.gz | |
use static fsfuncs and gp_fs_set_funcs()
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8634 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sipix')
| -rw-r--r-- | camlibs/sipix/blink2.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/camlibs/sipix/blink2.c b/camlibs/sipix/blink2.c index 34ba6a6cb..523149dc7 100644 --- a/camlibs/sipix/blink2.c +++ b/camlibs/sipix/blink2.c @@ -52,6 +52,7 @@ #define BLINK2_DELETE_ALL 0x12 #define BLINK2_CHECK_CAPTURE_FINISH 0x16 #define BLINK2_SET_EXPOSURE_COUNT 0x17 +#define BLINK2_GET_FIRMWARE_ID 0x18 static int blink2_getnumpics( @@ -60,8 +61,6 @@ blink2_getnumpics( char buf[6]; int ret; - ret = gp_port_usb_msg_read(port, 0x18, 0x03, 0, buf, 6); - ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2); ret = gp_port_usb_msg_read(port, BLINK2_GET_NUMPICS, 0x03, 0, buf, 2); if (ret<GP_OK) return ret; @@ -424,25 +423,29 @@ camera_id (CameraText *id) return (GP_OK); } +static CameraFilesystemFuncs fsfuncs = { + .file_list_func = file_list_func, + .get_file_func = get_file_func, + .delete_all_func = delete_all_func +}; + int camera_init (Camera *camera, GPContext *context) { - char buf[8]; + char buf[6]; int ret; GPPortSettings settings; camera->functions->capture = camera_capture; - gp_filesystem_set_list_funcs (camera->fs, file_list_func, NULL, camera); - gp_filesystem_set_file_funcs (camera->fs, get_file_func, NULL, camera); - gp_filesystem_set_folder_funcs (camera->fs, NULL, delete_all_func, NULL, NULL, camera); + gp_filesystem_set_funcs (camera->fs, &fsfuncs, camera); gp_port_get_settings( camera->port, &settings); settings.usb.interface = 0; settings.usb.altsetting = 0; ret = gp_port_set_settings (camera->port, settings); if (ret < GP_OK) return ret; - ret = gp_port_usb_msg_read( camera->port, 0x18, 0x03, 0, buf, 6); + ret = gp_port_usb_msg_read( camera->port, BLINK2_GET_FIRMWARE_ID, 0x03, 0, buf, 6); if (ret < GP_OK) return ret; ret = gp_port_usb_msg_read( camera->port, 0x04, 0x03, 0, buf, 1); |