diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2007-11-16 22:39:37 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2007-11-16 22:39:37 +0000 |
| commit | ce998a61a5d40aa00a20a5ac3e696bc3c8c9af3d (patch) | |
| tree | 110cc8f6d6f962d4543404b1b515b9b6970f3d7c /camlibs/sonydscf1 | |
| parent | dc63360a481f105df57a26118f3716baac901967 (diff) | |
| download | libgphoto2-ce998a61a5d40aa00a20a5ac3e696bc3c8c9af3d.tar.gz | |
remove sonydscf1.h (dup of common.h)
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10870 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/sonydscf1')
| -rw-r--r-- | camlibs/sonydscf1/Makefile-files | 2 | ||||
| -rw-r--r-- | camlibs/sonydscf1/command.c | 4 | ||||
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.c | 2 | ||||
| -rw-r--r-- | camlibs/sonydscf1/sonydscf1.h | 9 |
4 files changed, 4 insertions, 13 deletions
diff --git a/camlibs/sonydscf1/Makefile-files b/camlibs/sonydscf1/Makefile-files index 6877e6411..b6092453b 100644 --- a/camlibs/sonydscf1/Makefile-files +++ b/camlibs/sonydscf1/Makefile-files @@ -6,7 +6,7 @@ EXTRA_LTLIBRARIES += sony_dscf1.la sony_dscf1_la_SOURCES = \ sonydscf1/command.c sonydscf1/chotplay.c \ sonydscf1/command.h sonydscf1/chotplay.h \ - sonydscf1/sonydscf1.c sonydscf1/sonydscf1.h \ + sonydscf1/sonydscf1.c \ sonydscf1/pmp.h sonydscf1/common.h sony_dscf1_la_LDFLAGS = $(camlib_ldflags) sony_dscf1_la_DEPENDENCIES = $(camlib_dependencies) diff --git a/camlibs/sonydscf1/command.c b/camlibs/sonydscf1/command.c index d7d68cb6d..893f25a77 100644 --- a/camlibs/sonydscf1/command.c +++ b/camlibs/sonydscf1/command.c @@ -19,8 +19,8 @@ #endif static u_char address = 0; -static u_char sendaddr[8] = { 0x00, 0x22, 0x44, 0x66, 0x88, 0xaa, 0xcc, 0xee }; -static u_char recvaddr[8] = { 0x0e, 0x20, 0x42, 0x64, 0x86, 0xa8, 0xca, 0xec }; +static const u_char sendaddr[8] = { 0x00, 0x22, 0x44, 0x66, 0x88, 0xaa, 0xcc, 0xee }; +static const u_char recvaddr[8] = { 0x0e, 0x20, 0x42, 0x64, 0x86, 0xa8, 0xca, 0xec }; static int sw_mode = 0; static int pic_num = 0; static int pic_num2 = 0; diff --git a/camlibs/sonydscf1/sonydscf1.c b/camlibs/sonydscf1/sonydscf1.c index 6f5a35caa..9b90bf68c 100644 --- a/camlibs/sonydscf1/sonydscf1.c +++ b/camlibs/sonydscf1/sonydscf1.c @@ -1,5 +1,5 @@ #include "config.h" -#include "sonydscf1.h" +#include "common.h" #include <stdio.h> #include <string.h> diff --git a/camlibs/sonydscf1/sonydscf1.h b/camlibs/sonydscf1/sonydscf1.h deleted file mode 100644 index f91eafce7..000000000 --- a/camlibs/sonydscf1/sonydscf1.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __SONYDSCF1_H__ -#define __SONYDSCF1_H__ - -#define JPEG 0 -#define JPEG_T 1 -#define PMP 2 -#define PMX 3 - -#endif /* __SONYDSCF1_H__ */ |