diff --git a/camlibs/mars/library.c b/camlibs/mars/library.c index 5375a6183..52011369b 100644 --- a/camlibs/mars/library.c +++ b/camlibs/mars/library.c @@ -52,7 +52,7 @@ struct _CameraPrivateLibrary { Info info[0x2000]; }; -struct { +static const struct { char *name; CameraDriverStatus status; unsigned short idVendor; diff --git a/camlibs/mars/mars.c b/camlibs/mars/mars.c index e278c73ca..8f4ca82d2 100644 --- a/camlibs/mars/mars.c +++ b/camlibs/mars/mars.c @@ -114,7 +114,7 @@ mars_get_pic_data_size (Info *info, int n) return (info[8*n+6]*0x100 + info[8*n+5])*0x100 + info[8*n+4]; } -int +static int set_usb_in_endpoint (Camera *camera, int inep) { GPPortSettings settings; @@ -125,7 +125,7 @@ set_usb_in_endpoint (Camera *camera, int inep) } -int +static int mars_read_data (GPPort *port, char *data, int size) { int MAX_BULK = 0x2000; diff --git a/camlibs/mars/mars.h b/camlibs/mars/mars.h index 2667332b1..cdd6cc56c 100644 --- a/camlibs/mars/mars.h +++ b/camlibs/mars/mars.h @@ -40,8 +40,6 @@ int mars_init (Camera *camera, GPPort *port, Info *info); int mars_reset (GPPort *port); int mars_get_num_pics (Info *info); int mars_get_pic_data_size (Info *info, int n); -int set_usb_in_endpoint (Camera *camera, int inep); -int mars_read_data (GPPort *port, char *data, int size); int mars_read_picture_data (Camera *camera, Info *info, GPPort *port, char *data, int size, int n);