From 613ce782f0c7d714cc0e430c8cfd04740ea1350a Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 4 Dec 2006 20:29:52 +0000 Subject: [PATCH] 1 function static, 1 function if 0'ed git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9502 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/toshiba/pdrm11/pdrm11.c | 14 ++++++-------- camlibs/toshiba/pdrm11/pdrm11.h | 2 -- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/camlibs/toshiba/pdrm11/pdrm11.c b/camlibs/toshiba/pdrm11/pdrm11.c index c0a7cb2f0..1e8f533d8 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.c +++ b/camlibs/toshiba/pdrm11/pdrm11.c @@ -31,6 +31,8 @@ #define GP_MODULE "pdrm11" #define ETIMEDOUT 110 +static int pdrm11_select_file(GPPort *port, uint16_t file); + int pdrm11_init(GPPort *port) { unsigned char buf[20]; @@ -114,10 +116,7 @@ int pdrm11_get_filenames(GPPort *port, CameraList *list) return(GP_OK); } - - - -int pdrm11_select_file(GPPort *port, uint16_t file) +static int pdrm11_select_file(GPPort *port, uint16_t file) { char buf[10]; @@ -134,16 +133,15 @@ int pdrm11_select_file(GPPort *port, uint16_t file) return(GP_OK); } - - -int pdrm11_ping(GPPort *port) +#if 0 +static int pdrm11_ping(GPPort *port) { CHECK( gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_PING1, 1, NULL, 0) ); CHECK( gp_port_usb_msg_write(port, 0x01, PDRM11_CMD_PING2, 1, NULL, 0) ); return(GP_OK); } - +#endif int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type, diff --git a/camlibs/toshiba/pdrm11/pdrm11.h b/camlibs/toshiba/pdrm11/pdrm11.h index 86028e5c0..b9b61832d 100644 --- a/camlibs/toshiba/pdrm11/pdrm11.h +++ b/camlibs/toshiba/pdrm11/pdrm11.h @@ -62,8 +62,6 @@ int pdrm11_init(GPPort *port); -int pdrm11_select_file(GPPort *port, uint16_t file); -int pdrm11_ping(GPPort *port); int pdrm11_get_file(CameraFilesystem *fs, const char *filename, CameraFileType type, CameraFile *file, GPPort *port, uint16_t picNum); int pdrm11_get_filenames(GPPort *port, CameraList *list);