pass port around to avoid storing it globally.

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9429 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 16 insertions, 23 deletions

diff --git a/camlibs/sonydscf1/command.h b/camlibs/sonydscf1/command.h
index ffebf615b..43b7a1502 100644
--- a/camlibs/sonydscf1/command.h
+++ b/camlibs/sonydscf1/command.h
@@ -3,30 +3,23 @@
 
 #include "common.h"
 
-void	F1setfd P__((int));
-int	F1getfd  P__((void));
-int	F1reset P__((void));
-void    wbyte P__((u_char));
-u_char rbyte P__((void));
-void    wstr P__((u_char *, int));
-void    rstr P__((u_char *, int));
+void	F1setfd P__((GPPort*,int));
+int	F1getfd  P__((GPPort*));
+int	F1reset P__((GPPort*));
 u_char checksum(u_char addr, u_char *cp, int len);
-int     F1ok P__((void));
-long F1getdata P__((char *, u_char *, int));
-void sendcommand(u_char *p, int len);
-void Abort(void);
-int recvdata(u_char *p, int len);
-int	F1status P__((int));
-char	F1newstatus P__((int, char *));
-int	F1howmany P__((void));
-int     F1fopen P__((char *));
-long F1fread(u_char *data, long len);
-long F1fwrite(u_char *data, long len, u_char b);
-long     F1fseek P__((long, int));
-u_long     F1finfo P__((char *));
-int	F1fclose P__((void));
+int     F1ok P__((GPPort*));
+long F1getdata P__((GPPort*,char *, u_char *, int));
+int	F1status P__((GPPort*,int));
+char	F1newstatus P__((GPPort *port, int, char *));
+int	F1howmany P__((GPPort *));
+int     F1fopen P__((GPPort *,char *));
+long F1fread(GPPort *,u_char *data, long len);
+long F1fwrite(GPPort *,u_char *data, long len, u_char b);
+long     F1fseek P__((GPPort *,long, int));
+u_long     F1finfo P__((GPPort *,char *));
+int	F1fclose P__((GPPort *));
 
-int	F1deletepicture P__((int));
-int F1ffs P__((void));
+int	F1deletepicture P__((GPPort*,int));
+int F1ffs P__((GPPort*));
 
 #endif /* __COMMAND_H__ */