more updates, removed 1 empty file

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

5 files changed, 17 insertions, 20 deletions

diff --git a/camlibs/sonydscf1/ChangeLog b/camlibs/sonydscf1/ChangeLog
index 4527190e1..f5ee0539e 100644
--- a/camlibs/sonydscf1/ChangeLog
+++ b/camlibs/sonydscf1/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-16  Marcus Meissner  <marcus@jet.franken.de>
+
+	* *.[ch]: Major cleanup, make it work.
+
 2006-11-19  Marcus Meissner  <marcus@jet.franken.de>
 
 	* *.[ch]: Pass GPPort*port around to avoid global variables.
diff --git a/camlibs/sonydscf1/README.sonydscf1 b/camlibs/sonydscf1/README.sonydscf1
index 8414614d7..c5b83a170 100644
--- a/camlibs/sonydscf1/README.sonydscf1
+++ b/camlibs/sonydscf1/README.sonydscf1
@@ -1,8 +1,4 @@
-Remark about this camlib from 2001-11-17:
+Camera is freshly updated and new.
 
-> > There is a config.h checked in to CVS as camlibs/sonydscf1/config.h, which
-> > seems odd to me.  Also, I'm getting the error:
-> 
-> gphoto2/camlibs/sonydscf1 is horribly broken (global variables
-> everywhere, tons of compile warnings). I'd just ignore this library -
-> someone needs to completely rewrite it.
+- Image download works
+- --summary works
diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c
index 2030cdebd..d7d68cb6d 100644
--- a/camlibs/sonydscf1/command.c
+++ b/camlibs/sonydscf1/command.c
@@ -30,6 +30,8 @@ static int hour, minutes;
 static const u_char BOFRAME = 0xC0;
 static const u_char EOFRAME = 0xC1;
 
+static int F1reset(GPPort *port);
+
 static void wbyte(GPPort *port,u_char c)
 {
   u_char temp = c;
@@ -38,7 +40,8 @@ static void wbyte(GPPort *port,u_char c)
   }
 }
 
-u_char checksum(u_char addr, u_char *cp, int len)
+static u_char
+checksum(u_char addr, u_char *cp, int len)
 {
   int ret = addr;
   while(len --)
@@ -46,7 +49,8 @@ u_char checksum(u_char addr, u_char *cp, int len)
   return(0x100 -(ret & 0xff) );
 }
 
-static void sendcommand(GPPort *port,u_char *p, int len)
+static void
+sendcommand(GPPort *port,u_char *p, int len)
 {
   wbyte(port,BOFRAME);
   wbyte(port,sendaddr[address]);
@@ -57,7 +61,8 @@ static void sendcommand(GPPort *port,u_char *p, int len)
   if(address >7 ) address = 0;
 }
 
-static void Abort(GPPort *port)
+static void
+Abort(GPPort *port)
 {
   u_char buf[4];
   buf[0] = BOFRAME;
@@ -517,7 +522,8 @@ int F1ok(GPPort*port)
   return 0;                     /*ng*/
 }
 
-int F1reset(GPPort *port)
+static int
+F1reset(GPPort *port)
 {
   u_char buf[3];
   gp_log (GP_LOG_DEBUG, "F1reset", "Resetting camera...");
diff --git a/camlibs/sonydscf1/command.h b/camlibs/sonydscf1/command.h
index d4b5cdc45..232e2a450 100644
--- a/camlibs/sonydscf1/command.h
+++ b/camlibs/sonydscf1/command.h
@@ -3,10 +3,6 @@
 
 #include "common.h"
 
-void	F1setfd (GPPort*,int);
-int	F1getfd  (GPPort*);
-int	F1reset (GPPort*);
-u_char checksum(u_char addr, u_char *cp, int len);
 int     F1ok (GPPort*);
 long F1getdata (GPPort*,char *, u_char *, int);
 int	F1status (GPPort*,int);
@@ -20,6 +16,4 @@ u_long     F1finfo (GPPort *,char *);
 int	F1fclose (GPPort *);
 
 int	F1deletepicture (GPPort*,int);
-int F1ffs (GPPort*);
-
 #endif /* __COMMAND_H__ */
diff --git a/camlibs/sonydscf1/todo b/camlibs/sonydscf1/todo
deleted file mode 100644
index 037f73d15..000000000
--- a/camlibs/sonydscf1/todo
+++ /dev/null
@@ -1,3 +0,0 @@
-29 July 2000
---------------
-bvl: create a makefile on *nix* systems and test the modification