diff options
| author | bvl <simpson2@users.sourceforge.net> | 2001-03-13 00:51:15 +0000 |
|---|---|---|
| committer | bvl <simpson2@users.sourceforge.net> | 2001-03-13 00:51:15 +0000 |
| commit | 0b11738ebd0df774a8917b9152a649acefc86f19 (patch) | |
| tree | c766643e23f6f93a7e05b439f161fe6dd331d66f | |
| parent | bc4b605e1bb763bdf5245b4af032fe53342d6654 (diff) | |
| download | libgphoto2-0b11738ebd0df774a8917b9152a649acefc86f19.tar.gz | |
bvl: Updated complete OS/2 Make system
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1731 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/barbie/makefile.os2 | 31 | ||||
| -rw-r--r-- | camlibs/canon/canon.df | 2 | ||||
| -rw-r--r-- | camlibs/canon/makefile.os2 | 46 | ||||
| -rw-r--r-- | camlibs/digita/makefile.os2 | 42 | ||||
| -rw-r--r-- | camlibs/directory/directory.def | 2 | ||||
| -rw-r--r-- | camlibs/directory/makefile.os2 | 29 | ||||
| -rw-r--r-- | camlibs/kodak/dc120/kodak.df | 2 | ||||
| -rw-r--r-- | camlibs/kodak/dc120/makefile.os2 | 20 | ||||
| -rw-r--r-- | camlibs/kodak/dc3200/library.h | 2 | ||||
| -rw-r--r-- | camlibs/konica/konica.c | 2766 | ||||
| -rw-r--r-- | camlibs/konica/makefile.os2 | 36 | ||||
| -rw-r--r-- | camlibs/minolta/dimagev/dimagev.df | 2 | ||||
| -rw-r--r-- | camlibs/minolta/dimagev/makefile.os2 | 59 | ||||
| -rw-r--r-- | camlibs/panasonic/makefile.os2 | 40 | ||||
| -rw-r--r-- | camlibs/sierra/makefile.os2 | 28 | ||||
| -rw-r--r-- | frontends/command-line/makefile.os2 | 52 | ||||
| -rw-r--r-- | frontends/libgphoto2_frontend/makefile.os2 | 18 | ||||
| -rw-r--r-- | libgphoto2/filesys.c | 80 | ||||
| -rw-r--r-- | libgphoto2/makefile.os2 | 86 | ||||
| -rw-r--r-- | libgphoto2_port/makefile.os2 | 47 | ||||
| -rw-r--r-- | libgphoto2_port/serial/makefile.os2 | 37 | ||||
| -rw-r--r-- | libgphoto2_port/serial/unix.c | 4 |
22 files changed, 1611 insertions, 1820 deletions
diff --git a/camlibs/barbie/makefile.os2 b/camlibs/barbie/makefile.os2 index 93e34fc06..85f3200f6 100644 --- a/camlibs/barbie/makefile.os2 +++ b/camlibs/barbie/makefile.os2 @@ -1,32 +1,21 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -DEBUG -CC=gcc +BASEPATH=..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\os2mak.inc -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +dll: $(CAMLIBS)\gpbarbie.dll -dll: ..\gpbarbie.dll +OBJS= barbie.o \ + library.o -library.o : library.c library.h - @$(CC) -o $@ library.c $(CCFLAGS) - -barbie.o : barbie.c - @$(CC) -o $@ barbie.c $(CCFLAGS) +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) barbie.def: barbie.o - @copy barbie.df barbie.def - @emxexp $** >> barbie.def + @$(MAKEDEF) -..\gpbarbie.dll: barbie.o barbie.def library.o - @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +$(CAMLIBS)\gpbarbie.dll: $(OBJS) barbie.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/canon/canon.df b/camlibs/canon/canon.df index 0ff51ca96..553e91428 100644 --- a/camlibs/canon/canon.df +++ b/camlibs/canon/canon.df @@ -1,2 +1,2 @@ -LIBRARY GPDSCF1 +LIBRARY GPCANON EXPORTS diff --git a/camlibs/canon/makefile.os2 b/camlibs/canon/makefile.os2 index 3e025bad1..be7d376ee 100644 --- a/camlibs/canon/makefile.os2 +++ b/camlibs/canon/makefile.os2 @@ -1,41 +1,25 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\os2mak.inc -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +OBJS=util.o \ + serial.o \ + canon.o \ + psa50.o \ + crc.o \ + canon.def \ -dll: ..\gpcanon.dll - -util.o : util.c - $(CC) -o $@ util.c $(CCFLAGS) - -canon.o : canon.c - $(CC) -o $@ canon.c $(CCFLAGS) - -crc.o : crc.c - $(CC) -o $@ crc.c $(CCFLAGS) - -psa50.o : psa50.c - $(CC) -o $@ psa50.c $(CCFLAGS) - -serial.o : serial.c - $(CC) -o $@ serial.c $(CCFLAGS) +.c.o : + @$(CC) -o $@ $< $(CCFLAGS) canon.def: canon.o - copy canon.df canon.def - emxexp $** >> canon.def + @$(MAKEDEF) + +dll: $(CAMLIBS)\gpcanon.dll -..\gpcanon.dll: util.o canon.def serial.o canon.o psa50.o crc.o - $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +$(CAMLIBS)\gpcanon.dll: $(OBJS) + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/digita/makefile.os2 b/camlibs/digita/makefile.os2 index b5ca1288b..1a32153a0 100644 --- a/camlibs/digita/makefile.os2 +++ b/camlibs/digita/makefile.os2 @@ -1,39 +1,25 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -DEBUG -CC=gcc +BASEPATH=..\.. + all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** - -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** - -dll: ..\gpdigita.dll - -digita.o : digita.c digita.h - @$(CC) -o $@ digita.c $(CCFLAGS) - -serial.o : serial.c - @$(CC) -o $@ serial.c $(CCFLAGS) +!include $(BASEPATH)\os2mak.inc -usb.o : usb.c - @$(CC) -o $@ usb.c $(CCFLAGS) +dll: $(CAMLIBS)\gpdigita.dll -commands.o : commands.c - @$(CC) -o $@ commands.c $(CCFLAGS) +OBJS=digita.o \ + digita.def \ + serial.o \ + commands.o \ + usb.o +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) digita.def: digita.o - @copy digita.df digita.def - @emxexp $** >> digita.def + @$(MAKEDEF) -..\gpdigita.dll: digita.o digita.def serial.o commands.o usb.o - @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib -lsocket -lgiserial +$(CAMLIBS)\gpdigita.dll: $(OBJS) + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) -lsocket -lgiserial -L..\..\lib diff --git a/camlibs/directory/directory.def b/camlibs/directory/directory.def index c0416a9dd..1794894e5 100644 --- a/camlibs/directory/directory.def +++ b/camlibs/directory/directory.def @@ -1,7 +1,7 @@ LIBRARY GPDIRECT EXPORTS -; From ..\..\obj\directory.o +; From directory.o "extension" "is_image" "camera_id" diff --git a/camlibs/directory/makefile.os2 b/camlibs/directory/makefile.os2 index 1e41efd9f..614d0d34d 100644 --- a/camlibs/directory/makefile.os2 +++ b/camlibs/directory/makefile.os2 @@ -1,30 +1,21 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\OS2MAK.INC -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +dll: $(CAMLIBS)\gpdirbrw.dll -dll: ..\gpdirbrw.dll +OBJS=directory.o -..\..\obj\directory.o : directory.c directory.h - @$(CC) -o $@ directory.c $(CCFLAGS) +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) -directory.def: ..\..\obj\directory.o - @copy directory.df directory.def - @emxexp $** >> directory.def +directory.def: directory.o + @$(MAKEDEF) -..\gpdirbrw.dll: ..\..\obj\directory.o directory.def - @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\lib -llibgphoto2 -llibgphoto2_port -ldllib +$(CAMLIBS)\gpdirbrw.dll: $(OBJS) directory.def + @$(CC) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/kodak/dc120/kodak.df b/camlibs/kodak/dc120/kodak.df index 0ff51ca96..88095cbfc 100644 --- a/camlibs/kodak/dc120/kodak.df +++ b/camlibs/kodak/dc120/kodak.df @@ -1,2 +1,2 @@ -LIBRARY GPDSCF1 +LIBRARY GPDC120 EXPORTS diff --git a/camlibs/kodak/dc120/makefile.os2 b/camlibs/kodak/dc120/makefile.os2 index e92d1e048..846da6e20 100644 --- a/camlibs/kodak/dc120/makefile.os2 +++ b/camlibs/kodak/dc120/makefile.os2 @@ -1,22 +1,12 @@ -CCFLAGS=-O2 -c -I.. -I..\..\..\include -I..\..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\os2mak.inc -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** - -dll: ..\..\gpkodak.dll +dll: $(CAMLIBS)\gpdc120.dll library.o : library.c $(CC) -o $@ library.c $(CCFLAGS) @@ -28,5 +18,5 @@ kodak.def: dc120.o copy kodak.df kodak.def emxexp $** >> kodak.def -..\..\gpkodak.dll: kodak.def library.o dc120.o - $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +$(CAMLIBS)\gpdc120.dll: kodak.def library.o dc120.o + $(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/kodak/dc3200/library.h b/camlibs/kodak/dc3200/library.h index fdecee11d..06b1195dc 100644 --- a/camlibs/kodak/dc3200/library.h +++ b/camlibs/kodak/dc3200/library.h @@ -71,7 +71,7 @@ int dc3200_keep_alive(DC3200Data *dd); int dc3200_clear_read_buffer(DC3200Data *dd); int dump_buffer(unsigned char * buffer, int len, char *title, int bytesperline); -ulong bytes_to_l(int a, int b, int c, int d); +unsigned long bytes_to_l(int a, int b, int c, int d); #define LIBRARY_H_INCLUDED #endif diff --git a/camlibs/konica/konica.c b/camlibs/konica/konica.c index 25886a5c2..8b81220be 100644 --- a/camlibs/konica/konica.c +++ b/camlibs/konica/konica.c @@ -25,1176 +25,1176 @@ gint GP_RESULT (guchar byte1, guchar byte2); /*************/ /* Functions */ /*************/ -gint +gint GP_RESULT (guchar byte1, guchar byte2) { - switch ((byte2 << 8 ) | byte1) { - case 0x0000: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got GP_OK!"); - return (GP_OK); - case 0x0101: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_FOCUSING_ERROR!"); - return (KONICA_ERROR_FOCUSING_ERROR); - case 0x0102: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_IRIS_ERROR!"); - return (KONICA_ERROR_IRIS_ERROR); - case 0x0201: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_STROBE_ERROR!"); - return (KONICA_ERROR_STROBE_ERROR); - case 0x0203: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_EEPROM_CHECKSUM_ERROR!"); - return (KONICA_ERROR_EEPROM_CHECKSUM_ERROR); - case 0x0205: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_INTERNAL_ERROR1!"); - return (KONICA_ERROR_INTERNAL_ERROR1); - case 0x0206: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_INTERNAL_ERROR2!"); - return (KONICA_ERROR_INTERNAL_ERROR2); - case 0x0301: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_CARD_PRESENT!"); - return (KONICA_ERROR_NO_CARD_PRESENT); - case 0x0311: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_NOT_SUPPORTED!"); - return (KONICA_ERROR_CARD_NOT_SUPPORTED); - case 0x0321: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_REMOVED_DURING_ACCESS!"); - return (KONICA_ERROR_CARD_REMOVED_DURING_ACCESS); - case 0x0340: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_IMAGE_NUMBER_NOT_VALID!"); - return (KONICA_ERROR_IMAGE_NUMBER_NOT_VALID); - case 0x0341: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_CAN_NOT_BE_WRITTEN!"); - return (KONICA_ERROR_CARD_CAN_NOT_BE_WRITTEN); - case 0x0381: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_IS_WIRTE_PROTECTED!"); - return (KONICA_ERROR_CARD_IS_WRITE_PROTECTED); - case 0x0382: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_SPACE_LEFT_ON_CARD!"); - return (KONICA_ERROR_NO_SPACE_LEFT_ON_CARD); - case 0x0390: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_IMAGE_ERASED_AS_IMAGE_PROTECTED!"); - return (KONICA_ERROR_NO_IMAGE_ERASED_AS_IMAGE_PROTECTED); - case 0x0401: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LIGHT_TOO_DARK!"); - return (KONICA_ERROR_LIGHT_TOO_DARK); - case 0x0402: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_AUTOFOCUS_ERROR!"); - return (KONICA_ERROR_AUTOFOCUS_ERROR); - case 0x0501: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_SYSTEM_ERROR!"); - return (KONICA_ERROR_SYSTEM_ERROR); - case 0x0800: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_ILLEGAL_PARAMETER!"); - return (KONICA_ERROR_ILLEGAL_PARAMETER); - case 0x0801: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_COMMAND_CANNOT_BE_CANCELLED!"); - return (KONICA_ERROR_COMMAND_CANNOT_BE_CANCELLED); - case 0x0b00: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LOCALIZATION_DATA_EXCESS!"); - return (KONICA_ERROR_LOCALIZATION_DATA_EXCESS); - case 0x0bff: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LOCALIZATION_DATA_CORRUPT!"); - return (KONICA_ERROR_LOCALIZATION_DATA_CORRUPT); - case 0x0c01: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_UNSUPPORTED_COMMAND!"); - return (KONICA_ERROR_UNSUPPORTED_COMMAND); - case 0x0c02: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_OTHER_COMMAND_EXECUTING!"); - return (KONICA_ERROR_OTHER_COMMAND_EXECUTING); - case 0x0c03: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_COMMAND_ORDER_ERROR!"); - return (KONICA_ERROR_COMMAND_ORDER_ERROR); - case 0x0fff: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_UNKNOWN_ERROR!"); - return (KONICA_ERROR_UNKNOWN_ERROR); - default: - gp_debug_printf (GP_DEBUG_MEDIUM, "konica", - "The camera has just sent an error that has not " - "yet been discovered. Please report the following " - "to the maintainer of this driver with some " - "additional information how you got this error.\n" - " - Byte 1: %i\n" - " - Byte 2: %i\n" - "Thank you very much!\n", - byte1, - byte2); - return (GP_ERROR); - } + switch ((byte2 << 8 ) | byte1) { + case 0x0000: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got GP_OK!"); + return (GP_OK); + case 0x0101: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_FOCUSING_ERROR!"); + return (KONICA_ERROR_FOCUSING_ERROR); + case 0x0102: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_IRIS_ERROR!"); + return (KONICA_ERROR_IRIS_ERROR); + case 0x0201: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_STROBE_ERROR!"); + return (KONICA_ERROR_STROBE_ERROR); + case 0x0203: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_EEPROM_CHECKSUM_ERROR!"); + return (KONICA_ERROR_EEPROM_CHECKSUM_ERROR); + case 0x0205: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_INTERNAL_ERROR1!"); + return (KONICA_ERROR_INTERNAL_ERROR1); + case 0x0206: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_INTERNAL_ERROR2!"); + return (KONICA_ERROR_INTERNAL_ERROR2); + case 0x0301: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_CARD_PRESENT!"); + return (KONICA_ERROR_NO_CARD_PRESENT); + case 0x0311: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_NOT_SUPPORTED!"); + return (KONICA_ERROR_CARD_NOT_SUPPORTED); + case 0x0321: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_REMOVED_DURING_ACCESS!"); + return (KONICA_ERROR_CARD_REMOVED_DURING_ACCESS); + case 0x0340: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_IMAGE_NUMBER_NOT_VALID!"); + return (KONICA_ERROR_IMAGE_NUMBER_NOT_VALID); + case 0x0341: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_CAN_NOT_BE_WRITTEN!"); + return (KONICA_ERROR_CARD_CAN_NOT_BE_WRITTEN); + case 0x0381: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_CARD_IS_WIRTE_PROTECTED!"); + return (KONICA_ERROR_CARD_IS_WRITE_PROTECTED); + case 0x0382: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_SPACE_LEFT_ON_CARD!"); + return (KONICA_ERROR_NO_SPACE_LEFT_ON_CARD); + case 0x0390: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_NO_IMAGE_ERASED_AS_IMAGE_PROTECTED!"); + return (KONICA_ERROR_NO_IMAGE_ERASED_AS_IMAGE_PROTECTED); + case 0x0401: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LIGHT_TOO_DARK!"); + return (KONICA_ERROR_LIGHT_TOO_DARK); + case 0x0402: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_AUTOFOCUS_ERROR!"); + return (KONICA_ERROR_AUTOFOCUS_ERROR); + case 0x0501: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_SYSTEM_ERROR!"); + return (KONICA_ERROR_SYSTEM_ERROR); + case 0x0800: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_ILLEGAL_PARAMETER!"); + return (KONICA_ERROR_ILLEGAL_PARAMETER); + case 0x0801: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_COMMAND_CANNOT_BE_CANCELLED!"); + return (KONICA_ERROR_COMMAND_CANNOT_BE_CANCELLED); + case 0x0b00: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LOCALIZATION_DATA_EXCESS!"); + return (KONICA_ERROR_LOCALIZATION_DATA_EXCESS); + case 0x0bff: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_LOCALIZATION_DATA_CORRUPT!"); + return (KONICA_ERROR_LOCALIZATION_DATA_CORRUPT); + case 0x0c01: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_UNSUPPORTED_COMMAND!"); + return (KONICA_ERROR_UNSUPPORTED_COMMAND); + case 0x0c02: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_OTHER_COMMAND_EXECUTING!"); + return (KONICA_ERROR_OTHER_COMMAND_EXECUTING); + case 0x0c03: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_COMMAND_ORDER_ERROR!"); + return (KONICA_ERROR_COMMAND_ORDER_ERROR); + case 0x0fff: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", "*** Got KONICA_ERROR_UNKNOWN_ERROR!"); + return (KONICA_ERROR_UNKNOWN_ERROR); + default: + gp_debug_printf (GP_DEBUG_MEDIUM, "konica", + "The camera has just sent an error that has not " + "yet been discovered. Please report the following " + "to the maintainer of this driver with some " + "additional information how you got this error.\n" + " - Byte 1: %i\n" + " - Byte 2: %i\n" + "Thank you very much!\n", + byte1, + byte2); + return (GP_ERROR); + } } -gint +gint k_init (gp_port* device) { - return (l_init (device)); + return (l_init (device)); } -gint -k_exit (gp_port* device) +gint +k_exit (gp_port* device) { - return (l_exit (device)); + return (l_exit (device)); } -gint +gint k_erase_image (gp_port* device, gboolean image_id_long, gulong image_id) { - /************************************************/ - /* Command to erase one image. */ - /* */ - /* 0x00: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* 0xXX: Byte 3 of image ID (QM200 only) */ - /* 0xXX: Byte 4 of image ID (QM200 only) */ - /* 0xXX: Byte 0 of image ID */ - /* 0xXX: Byte 1 of image ID */ - /* */ - /* Return values: */ - /* 0x00: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x00, 0x80, 0x00, 0x00, 0x02, - 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - if (!image_id_long) { - sb[6] = image_id; - sb[7] = image_id >> 8; - result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); - } else { - sb[6] = image_id >> 16; - sb[7] = image_id >> 24; - sb[8] = image_id; - sb[9] = image_id >> 8; - result = l_send_receive (device, sb, 10, &rb, &rbs, 0, NULL, NULL); - } - if (result == GP_OK) result = GP_RESULT (rb [2], rb [3]); - g_free (rb); - return (result); + /************************************************/ + /* Command to erase one image. */ + /* */ + /* 0x00: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* 0xXX: Byte 3 of image ID (QM200 only) */ + /* 0xXX: Byte 4 of image ID (QM200 only) */ + /* 0xXX: Byte 0 of image ID */ + /* 0xXX: Byte 1 of image ID */ + /* */ + /* Return values: */ + /* 0x00: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x00, 0x80, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + if (!image_id_long) { + sb[6] = image_id; + sb[7] = image_id >> 8; + result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); + } else { + sb[6] = image_id >> 16; + sb[7] = image_id >> 24; + sb[8] = image_id; + sb[9] = image_id >> 8; + result = l_send_receive (device, sb, 10, &rb, &rbs, 0, NULL, NULL); + } + if (result == GP_OK) result = GP_RESULT (rb [2], rb [3]); + g_free (rb); + return (result); } -gint +gint k_format_memory_card (gp_port* device) { - /************************************************/ - /* Command to format the memory card. */ - /* */ - /* 0x10: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* */ - /* Return values: */ - /* 0x10: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x10, 0x80, 0x00, 0x00, 0x02, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + /************************************************/ + /* Command to format the memory card. */ + /* */ + /* 0x10: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* */ + /* Return values: */ + /* 0x10: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x10, 0x80, 0x00, 0x00, 0x02, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } gint k_erase_all (gp_port* device, guint* number_of_images_not_erased) { - /************************************************/ - /* Command to erase all images in the camera, */ - /* except the protected ones. */ - /* */ - /* 0x20: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* */ - /* Return values: */ - /* 0x20: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /* Following bytes only in case of success. */ - /* 0xXX: Byte 0 of number of images not erased */ - /* 0xXX: Byte 1 of number of images not erased */ - /************************************************/ - guchar sb[] = {0x20, 0x80, 0x00, 0x00, 0x02, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (number_of_images_not_erased, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) *number_of_images_not_erased = (rb[5] << 8) | rb[4]; - } - g_free (rb); - return (result); + /************************************************/ + /* Command to erase all images in the camera, */ + /* except the protected ones. */ + /* */ + /* 0x20: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* */ + /* Return values: */ + /* 0x20: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /* Following bytes only in case of success. */ + /* 0xXX: Byte 0 of number of images not erased */ + /* 0xXX: Byte 1 of number of images not erased */ + /************************************************/ + guchar sb[] = {0x20, 0x80, 0x00, 0x00, 0x02, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (number_of_images_not_erased, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) *number_of_images_not_erased = (rb[5] << 8) | rb[4]; + } + g_free (rb); + return (result); } gint k_set_protect_status (gp_port *device, gboolean image_id_long, gulong image_id, gboolean protected) { - /************************************************/ - /* Command to set the protect status of one */ - /* image. */ - /* */ - /* 0x30: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* 0xXX: Byte 3 of image ID (QM200 only) */ - /* 0xXX: Byte 4 of image ID (QM200 only) */ - /* 0xXX: Byte 0 of image ID */ - /* 0xXX: Byte 1 of image ID */ - /* 0xXX: Byte 0 of protect status */ - /* 0x00: not protected */ - /* 0x01: protected */ - /* 0x00: Byte 1 of protect status */ - /* */ - /* Return values: */ - /* 0x30: Byte 0 of command identifier */ - /* 0x80: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x30, 0x80, 0x00, 0x00, 0x02, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - if (!image_id_long) { - if (protected) sb[8] = 0x01; - sb[6] = image_id; - sb[7] = image_id >> 8; - result = l_send_receive (device, sb, 10, &rb, &rbs, 0, NULL, NULL); - } else { - if (protected) sb[10] = 0x01; - sb[6] = image_id >> 16; - sb[7] = image_id >> 24; - sb[8] = image_id; - sb[9] = image_id >> 8; - result = l_send_receive (device, sb, 12, &rb, &rbs, 0, NULL, NULL); - } - if (result == GP_OK) result = GP_RESULT (rb [2], rb [3]); - g_free (rb); - return (result); + /************************************************/ + /* Command to set the protect status of one */ + /* image. */ + /* */ + /* 0x30: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* 0xXX: Byte 3 of image ID (QM200 only) */ + /* 0xXX: Byte 4 of image ID (QM200 only) */ + /* 0xXX: Byte 0 of image ID */ + /* 0xXX: Byte 1 of image ID */ + /* 0xXX: Byte 0 of protect status */ + /* 0x00: not protected */ + /* 0x01: protected */ + /* 0x00: Byte 1 of protect status */ + /* */ + /* Return values: */ + /* 0x30: Byte 0 of command identifier */ + /* 0x80: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x30, 0x80, 0x00, 0x00, 0x02, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + if (!image_id_long) { + if (protected) sb[8] = 0x01; + sb[6] = image_id; + sb[7] = image_id >> 8; + result = l_send_receive (device, sb, 10, &rb, &rbs, 0, NULL, NULL); + } else { + if (protected) sb[10] = 0x01; + sb[6] = image_id >> 16; + sb[7] = image_id >> 24; + sb[8] = image_id; + sb[9] = image_id >> 8; + result = l_send_receive (device, sb, 12, &rb, &rbs, 0, NULL, NULL); + } + if (result == GP_OK) result = GP_RESULT (rb [2], rb [3]); + g_free (rb); + return (result); } -gint +gint k_get_image ( - gp_port* device, - gboolean image_id_long, - gulong image_id, - k_image_type_t image_type, - guchar** image_buffer, - guint* image_buffer_size) + gp_port* device, + gboolean image_id_long, + gulong image_id, + k_image_type_t image_type, + guchar** image_buffer, + guint* image_buffer_size) { - /************************************************/ - /* Commands to get an image from the camera. */ - /* */ - /* 0xXX: Byte 0 of command identifier */ - /* 0x00: get thumbnail */ - /* 0x10: get image (jpeg) */ - /* 0x30: get image (exif) */ - /* 0x88: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* 0xXX: Byte 3 of image ID (QM200 only) */ - /* 0xXX: Byte 4 of image ID (QM200 only) */ - /* 0xXX: Byte 0 of image ID */ - /* 0xXX: Byte 1 of image ID */ - /* */ - /* The data will be received first, followed by */ - /* the return values. */ - /* */ - /* Return values: */ - /* 0xXX: Byte 0 of command identifier */ - /* 0x00: get thumbnail */ - /* 0x10: get image (jpeg) */ - /* 0x30: get image (exif) */ - /* 0x88: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x00, 0x88, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar *rb = NULL; - guint rbs; - - g_return_val_if_fail (image_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*image_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (image_buffer_size, GP_ERROR_BAD_PARAMETERS); + /************************************************/ + /* Commands to get an image from the camera. */ + /* */ + /* 0xXX: Byte 0 of command identifier */ + /* 0x00: get thumbnail */ + /* 0x10: get image (jpeg) */ + /* 0x30: get image (exif) */ + /* 0x88: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* 0xXX: Byte 3 of image ID (QM200 only) */ + /* 0xXX: Byte 4 of image ID (QM200 only) */ + /* 0xXX: Byte 0 of image ID */ + /* 0xXX: Byte 1 of image ID */ + /* */ + /* The data will be received first, followed by */ + /* the return values. */ + /* */ + /* Return values: */ + /* 0xXX: Byte 0 of command identifier */ + /* 0x00: get thumbnail */ + /* 0x10: get image (jpeg) */ + /* 0x30: get image (exif) */ + /* 0x88: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x00, 0x88, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar *rb = NULL; + guint rbs; + + g_return_val_if_fail (image_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*image_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (image_buffer_size, GP_ERROR_BAD_PARAMETERS); switch (image_type) { - case K_THUMBNAIL: - sb[0] = 0x00; - break; - case K_IMAGE_JPEG: - sb[0] = 0x10; - break; - case K_IMAGE_EXIF: - sb[0] = 0x30; - break; - } - if (!image_id_long) { - sb[6] = image_id; - sb[7] = image_id >> 8; - result = l_send_receive (device, sb, 8, &rb, &rbs, 5000, image_buffer, image_buffer_size); - } else { - sb[6] = image_id >> 16; - sb[7] = image_id >> 24; - sb[8] = image_id; - sb[9] = image_id >> 8; - result = l_send_receive (device, sb, 10, &rb, &rbs, 5000, image_buffer, image_buffer_size); - } - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + case K_THUMBNAIL: + sb[0] = 0x00; + break; + case K_IMAGE_JPEG: + sb[0] = 0x10; + break; + case K_IMAGE_EXIF: + sb[0] = 0x30; + break; + } + if (!image_id_long) { + sb[6] = image_id; + sb[7] = image_id >> 8; + result = l_send_receive (device, sb, 8, &rb, &rbs, 5000, image_buffer, image_buffer_size); + } else { + sb[6] = image_id >> 16; + sb[7] = image_id >> 24; + sb[8] = image_id; + sb[9] = image_id >> 8; + result = l_send_receive (device, sb, 10, &rb, &rbs, 5000, image_buffer, image_buffer_size); + } + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } -gint +gint k_get_image_information ( - gp_port* device, - gboolean image_id_long, - gulong image_number, - gulong* image_id, - guint* exif_size, - gboolean* protected, - guchar** information_buffer, - guint* information_buffer_size) + gp_port* device, + gboolean image_id_long, + gulong image_number, + gulong* image_id, + guint* exif_size, + gboolean* protected, + guchar** information_buffer, + guint* information_buffer_size) { - /************************************************/ - /* Command to get the information about an */ - /* image from the camera. */ - /* */ - /* 0x20: Byte 0 of command identifier */ - /* 0x88: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of device ID */ - /* 0x02: Flash memory card */ - /* 0xXX: Byte 1 of device ID */ - /* 0x00: Flash memory card */ - /* 0xXX: Byte 3 of image number (QM200 only) */ - /* 0xXX: Byte 4 of image number (QM200 only) */ - /* 0xXX: Byte 0 of image number */ - /* 0xXX: Byte 1 of image number */ - /* */ - /* The data will be received first, followed by */ - /* the return values. */ - /* */ - /* Return values: */ - /* 0x20: Byte 0 of command identifier */ - /* 0x88: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /* Following bytes only in case of success. */ - /* 0xXX: Byte 3 of image ID (QM200 only) */ - /* 0xXX: Byte 4 of image ID (QM200 only) */ - /* 0xXX: Byte 0 of image ID */ - /* 0xXX: Byte 1 of image ID */ - /* 0xXX: Byte 0 of exif size */ - /* 0xXX: Byte 1 of exif size */ - /* 0xXX: Byte 0 of protect status */ - /* 0x00: not protected */ - /* 0x01: protected */ - /* 0x00: Byte 1 of protect status */ - /************************************************/ - guchar sb[] = {0x20, 0x88, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (image_id, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (exif_size, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (protected, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (information_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*information_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (information_buffer_size, GP_ERROR_BAD_PARAMETERS); + /************************************************/ + /* Command to get the information about an */ + /* image from the camera. */ + /* */ + /* 0x20: Byte 0 of command identifier */ + /* 0x88: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of device ID */ + /* 0x02: Flash memory card */ + /* 0xXX: Byte 1 of device ID */ + /* 0x00: Flash memory card */ + /* 0xXX: Byte 3 of image number (QM200 only) */ + /* 0xXX: Byte 4 of image number (QM200 only) */ + /* 0xXX: Byte 0 of image number */ + /* 0xXX: Byte 1 of image number */ + /* */ + /* The data will be received first, followed by */ + /* the return values. */ + /* */ + /* Return values: */ + /* 0x20: Byte 0 of command identifier */ + /* 0x88: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /* Following bytes only in case of success. */ + /* 0xXX: Byte 3 of image ID (QM200 only) */ + /* 0xXX: Byte 4 of image ID (QM200 only) */ + /* 0xXX: Byte 0 of image ID */ + /* 0xXX: Byte 1 of image ID */ + /* 0xXX: Byte 0 of exif size */ + /* 0xXX: Byte 1 of exif size */ + /* 0xXX: Byte 0 of protect status */ + /* 0x00: not protected */ + /* 0x01: protected */ + /* 0x00: Byte 1 of protect status */ + /************************************************/ + guchar sb[] = {0x20, 0x88, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (image_id, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (exif_size, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (protected, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (information_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*information_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (information_buffer_size, GP_ERROR_BAD_PARAMETERS); if (!image_id_long) { - sb[6] = image_number; - sb[7] = image_number >> 8; - result = l_send_receive (device, sb, 8, &rb, &rbs, 1000, information_buffer, information_buffer_size); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *image_id = (gulong) ((rb[5] << 8) | rb[4]); - *exif_size = (rb[7] << 8) | rb[6]; - *protected = (rb[8] != 0x00); - } - } - } else { - sb[6] = image_number >> 16; - sb[7] = image_number >> 24; - sb[8] = image_number; - sb[9] = image_number >> 8; - result = l_send_receive (device, sb, 10, &rb, &rbs, 1000, information_buffer, information_buffer_size); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *image_id = (rb[5] << 24) | (rb[4] << 16) | (rb[7] << 8) | rb[6]; - *exif_size = (rb[9] << 8) | rb[8]; - *protected = (rb[10] != 0x00); - } - } - } - g_free (rb); - return (result); + sb[6] = image_number; + sb[7] = image_number >> 8; + result = l_send_receive (device, sb, 8, &rb, &rbs, 1000, information_buffer, information_buffer_size); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *image_id = (gulong) ((rb[5] << 8) | rb[4]); + *exif_size = (rb[7] << 8) | rb[6]; + *protected = (rb[8] != 0x00); + } + } + } else { + sb[6] = image_number >> 16; + sb[7] = image_number >> 24; + sb[8] = image_number; + sb[9] = image_number >> 8; + result = l_send_receive (device, sb, 10, &rb, &rbs, 1000, information_buffer, information_buffer_size); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *image_id = (rb[5] << 24) | (rb[4] << 16) | (rb[7] << 8) | rb[6]; + *exif_size = (rb[9] << 8) | rb[8]; + *protected = (rb[10] != 0x00); + } + } + } + g_free (rb); + return (result); } -gint +gint k_get_preview (gp_port* device, gboolean thumbnail, guchar** image_buffer, guint* image_buffer_size) { - /************************************************/ - /* Command to get the preview from the camera. */ - /* */ - /* 0x40: Byte 0 of command identifier */ - /* 0x88: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of preview mode */ - /* 0x00: no thumbnail */ - /* 0x01: thumbnail */ - /* 0x00: Byte 1 of preview mode */ - /* */ - /* The data will be received first, followed by */ - /* the return values. */ - /* */ - /* Return values: */ - /* 0x40: Byte 0 of command identifier */ - /* 0x88: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x40, 0x88, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (image_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*image_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (image_buffer_size, GP_ERROR_BAD_PARAMETERS); - - if (thumbnail) sb[4] = 0x01; - result = l_send_receive (device, sb, 6, &rb, &rbs, 5000, image_buffer, image_buffer_size); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + /************************************************/ + /* Command to get the preview from the camera. */ + /* */ + /* 0x40: Byte 0 of command identifier */ + /* 0x88: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of preview mode */ + /* 0x00: no thumbnail */ + /* 0x01: thumbnail */ + /* 0x00: Byte 1 of preview mode */ + /* */ + /* The data will be received first, followed by */ + /* the return values. */ + /* */ + /* Return values: */ + /* 0x40: Byte 0 of command identifier */ + /* 0x88: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x40, 0x88, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (image_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*image_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (image_buffer_size, GP_ERROR_BAD_PARAMETERS); + + if (thumbnail) sb[4] = 0x01; + result = l_send_receive (device, sb, 6, &rb, &rbs, 5000, image_buffer, image_buffer_size); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } gint k_get_io_capability ( - gp_port* device, - gboolean* bit_rate_300, - gboolean* bit_rate_600, - gboolean* bit_rate_1200, - gboolean* bit_rate_2400, - gboolean* bit_rate_4800, - gboolean* bit_rate_9600, - gboolean* bit_rate_19200, - gboolean* bit_rate_38400, - gboolean* bit_rate_57600, - gboolean* bit_rate_115200, - gboolean* bit_flag_8_bits, - gboolean* bit_flag_stop_2_bits, - gboolean* bit_flag_parity_on, - gboolean* bit_flag_parity_odd, - gboolean* bit_flag_hw_flow_control) + gp_port* device, + gboolean* bit_rate_300, + gboolean* bit_rate_600, + gboolean* bit_rate_1200, + gboolean* bit_rate_2400, + gboolean* bit_rate_4800, + gboolean* bit_rate_9600, + gboolean* bit_rate_19200, + gboolean* bit_rate_38400, + gboolean* bit_rate_57600, + gboolean* bit_rate_115200, + gboolean* bit_flag_8_bits, + gboolean* bit_flag_stop_2_bits, + gboolean* bit_flag_parity_on, + gboolean* bit_flag_parity_odd, + gboolean* bit_flag_hw_flow_control) { - /************************************************/ - /* Command to get the IO capability from the */ - /* camera. */ - /* */ - /* 0x00: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* */ - /* Return values: */ - /* 0x40: Byte 0 of command identifier */ - /* 0x88: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to get the IO capability from the */ + /* camera. */ + /* */ + /* 0x00: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* */ + /* Return values: */ + /* 0x40: Byte 0 of command identifier */ + /* 0x88: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Byte 0 of supported bit rates */ - /* 0xXX: Byte 1 of supported bit rates */ - /* 0xXX: Byte 0 of supported flags */ - /* 0xXX: Byte 1 of supported flags */ - /************************************************/ - guchar sb[] = {0x00, 0x90, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (bit_rate_300, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_600, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_1200, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_2400, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_4800, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_9600, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_19200, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_38400, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_57600, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_rate_115200, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_flag_8_bits, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_flag_stop_2_bits, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_flag_parity_on, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_flag_parity_odd, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (bit_flag_hw_flow_control, GP_ERROR_BAD_PARAMETERS); - - result = (l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL)); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *bit_rate_300 = ((rb[4] ^ (1 << 0)) && ~rb[4]); - *bit_rate_600 = ((rb[4] ^ (1 << 1)) && ~rb[4]); - *bit_rate_1200 = ((rb[4] ^ (1 << 2)) && ~rb[4]); - *bit_rate_2400 = ((rb[4] ^ (1 << 3)) && ~rb[4]); - *bit_rate_4800 = ((rb[4] ^ (1 << 4)) && ~rb[4]); - *bit_rate_9600 = ((rb[4] ^ (1 << 5)) && ~rb[4]); - *bit_rate_19200 = ((rb[4] ^ (1 << 6)) && ~rb[4]); - *bit_rate_38400 = ((rb[4] ^ (1 << 7)) && ~rb[4]); - *bit_rate_57600 = ((rb[5] ^ (1 << 0)) && ~rb[5]); - *bit_rate_115200 = ((rb[5] ^ (1 << 1)) && ~rb[5]); - *bit_flag_8_bits = ((rb[6] ^ (1 << 0)) && ~rb[6]); - *bit_flag_stop_2_bits = ((rb[6] ^ (1 << 1)) && ~rb[6]); - *bit_flag_parity_on = ((rb[6] ^ (1 << 2)) && ~rb[6]); - *bit_flag_parity_odd = ((rb[6] ^ (1 << 3)) && ~rb[6]); - *bit_flag_hw_flow_control= ((rb[6] ^ (1 << 4)) && ~rb[6]); - } - } - g_free (rb); - return result; + /* 0xXX: Byte 0 of supported bit rates */ + /* 0xXX: Byte 1 of supported bit rates */ + /* 0xXX: Byte 0 of supported flags */ + /* 0xXX: Byte 1 of supported flags */ + /************************************************/ + guchar sb[] = {0x00, 0x90, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (bit_rate_300, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_600, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_1200, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_2400, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_4800, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_9600, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_19200, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_38400, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_57600, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_rate_115200, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_flag_8_bits, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_flag_stop_2_bits, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_flag_parity_on, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_flag_parity_odd, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (bit_flag_hw_flow_control, GP_ERROR_BAD_PARAMETERS); + + result = (l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL)); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *bit_rate_300 = ((rb[4] ^ (1 << 0)) && ~rb[4]); + *bit_rate_600 = ((rb[4] ^ (1 << 1)) && ~rb[4]); + *bit_rate_1200 = ((rb[4] ^ (1 << 2)) && ~rb[4]); + *bit_rate_2400 = ((rb[4] ^ (1 << 3)) && ~rb[4]); + *bit_rate_4800 = ((rb[4] ^ (1 << 4)) && ~rb[4]); + *bit_rate_9600 = ((rb[4] ^ (1 << 5)) && ~rb[4]); + *bit_rate_19200 = ((rb[4] ^ (1 << 6)) && ~rb[4]); + *bit_rate_38400 = ((rb[4] ^ (1 << 7)) && ~rb[4]); + *bit_rate_57600 = ((rb[5] ^ (1 << 0)) && ~rb[5]); + *bit_rate_115200 = ((rb[5] ^ (1 << 1)) && ~rb[5]); + *bit_flag_8_bits = ((rb[6] ^ (1 << 0)) && ~rb[6]); + *bit_flag_stop_2_bits = ((rb[6] ^ (1 << 1)) && ~rb[6]); + *bit_flag_parity_on = ((rb[6] ^ (1 << 2)) && ~rb[6]); + *bit_flag_parity_odd = ((rb[6] ^ (1 << 3)) && ~rb[6]); + *bit_flag_hw_flow_control= ((rb[6] ^ (1 << 4)) && ~rb[6]); + } + } + g_free (rb); + return result; } -gint +gint k_get_information ( - gp_port* device, - gchar** model, - gchar** serial_number, - guchar* hardware_version_major, - guchar* hardware_version_minor, - guchar* software_version_major, - guchar* software_version_minor, - guchar* testing_software_version_major, - guchar* testing_software_version_minor, - gchar** name, - gchar** manufacturer) + gp_port* device, + gchar** model, + gchar** serial_number, + guchar* hardware_version_major, + guchar* hardware_version_minor, + guchar* software_version_major, + guchar* software_version_minor, + guchar* testing_software_version_major, + guchar* testing_software_version_minor, + gchar** name, + gchar** manufacturer) { - /************************************************/ - /* Command to get some information about the */ - /* camera. */ - /* */ - /* 0x10: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* (...) */ - /* */ - /* You can add pairs of additional bytes with */ - /* no effect on the command. */ - /* */ - /* Return values: */ - /* 0x10: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to get some information about the */ + /* camera. */ + /* */ + /* 0x10: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* (...) */ + /* */ + /* You can add pairs of additional bytes with */ + /* no effect on the command. */ + /* */ + /* Return values: */ + /* 0x10: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Reserved */ - /* 0xXX: Reserved */ - /* 0xXX: Reserved */ - /* 0xXX: Reserved */ - /* 0xXX: Byte 0 of model */ - /* 0xXX: Byte 1 of model */ - /* 0xXX: Byte 2 of model */ - /* 0xXX: Byte 3 of model */ - /* 0xXX: Byte 0 of serial number */ - /* 0xXX: Byte 1 of serial number */ - /* 0xXX: Byte 2 serial number */ - /* 0xXX: Byte 3 serial number */ - /* 0xXX: Byte 4 serial number */ - /* 0xXX: Byte 5 serial number */ - /* 0xXX: Byte 6 serial number */ - /* 0xXX: Byte 7 serial number */ - /* 0xXX: Byte 8 serial number */ - /* 0xXX: Byte 9 serial number */ - /* 0xXX: Hardware version (major) */ - /* 0xXX: Hardware version (minor) */ - /* 0xXX: Software version (major) */ - /* 0xXX: Software version (minor) */ - /* 0xXX: Testing software version (major) */ - /* 0xXX: Testing software version (minor) */ - /* 0xXX: Byte 0 of name */ - /* 0xXX: Byte 1 of name */ - /* 0xXX: Byte 2 of name */ - /* 0xXX: Byte 3 of name */ - /* 0xXX: Byte 4 of name */ - /* 0xXX: Byte 5 of name */ - /* 0xXX: Byte 6 of name */ - /* 0xXX: Byte 7 of name */ - /* 0xXX: Byte 8 of name */ - /* 0xXX: Byte 9 of name */ - /* 0xXX: Byte 10 of name */ - /* 0xXX: Byte 11 of name */ - /* 0xXX: Byte 12 of name */ - /* 0xXX: Byte 13 of name */ - /* 0xXX: Byte 14 of name */ - /* 0xXX: Byte 15 of name */ - /* 0xXX: Byte 16 of name */ - /* 0xXX: Byte 17 of name */ - /* 0xXX: Byte 18 of name */ - /* 0xXX: Byte 19 of name */ - /* 0xXX: Byte 20 of name */ - /* 0xXX: Byte 21 of name */ - /* 0xXX: Byte 0 of manufacturer */ - /* 0xXX: Byte 1 of manufacturer */ - /* 0xXX: Byte 2 of manufacturer */ - /* 0xXX: Byte 3 of manufacturer */ - /* 0xXX: Byte 4 of manufacturer */ - /* 0xXX: Byte 5 of manufacturer */ - /* 0xXX: Byte 6 of manufacturer */ - /* 0xXX: Byte 7 of manufacturer */ - /* 0xXX: Byte 8 of manufacturer */ - /* 0xXX: Byte 9 of manufacturer */ - /* 0xXX: Byte 10 of manufacturer */ - /* 0xXX: Byte 11 of manufacturer */ - /* 0xXX: Byte 12 of manufacturer */ - /* 0xXX: Byte 13 of manufacturer */ - /* 0xXX: Byte 14 of manufacturer */ - /* 0xXX: Byte 15 of manufacturer */ - /* 0xXX: Byte 16 of manufacturer */ - /* 0xXX: Byte 17 of manufacturer */ - /* 0xXX: Byte 18 of manufacturer */ - /* 0xXX: Byte 19 of manufacturer */ - /* 0xXX: Byte 20 of manufacturer */ - /* 0xXX: Byte 21 of manufacturer */ - /* 0xXX: Byte 22 of manufacturer */ - /* 0xXX: Byte 23 of manufacturer */ - /* 0xXX: Byte 24 of manufacturer */ - /* 0xXX: Byte 25 of manufacturer */ - /* 0xXX: Byte 26 of manufacturer */ - /* 0xXX: Byte 27 of manufacturer */ - /* 0xXX: Byte 28 of manufacturer */ - /* 0xXX: Byte 29 of manufacturer */ - /************************************************/ - guchar sb[] = {0x10, 0x90, 0x00, 0x00}; - guint i, j; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (model, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*model, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (serial_number, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*serial_number, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (hardware_version_major, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (hardware_version_minor, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (software_version_major, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (software_version_minor, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (testing_software_version_major, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (testing_software_version_minor, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (name, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*name, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (manufacturer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*manufacturer, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - /****************/ - /* Model */ - /****************/ - for (i = 0; i < 4; i++) if (rb[8 + i] == 0) break; - *model = g_new0 (gchar, i + 1); - for (j = 0; j < i; j++) (*model)[j] = rb[8 + j]; - /************************/ - /* Serial Number */ - /************************/ - for (i = 0; i < 10; i++) if (rb[12 + i] == 0) break; - *serial_number = g_new0 (gchar, i + 1); - for (j = 0; j < i; j++) - (*serial_number)[j] = rb[12 + j]; - /****************/ - /* Versions */ - /****************/ - *hardware_version_major = rb[22]; - *hardware_version_minor = rb[23]; - *software_version_major = rb[24]; - *software_version_minor = rb[25]; - *testing_software_version_major = rb[26]; - *testing_software_version_minor = rb[27]; - /****************/ - /* Name */ - /****************/ - for (i = 0; i < 22; i++) if (rb[28 + i] == 0) break; - *name = g_new0 (gchar, i + 1); - for (j = 0; j < i; j++) (*name)[j] = rb[28 + j]; - /****************/ - /* Manufacturer */ - /****************/ - for (i = 0; i < 30; i++) if (rb[50 + i] == 0) break; - *manufacturer = g_new0 (gchar, i + 1); - for (j = 0; j < i; j++) (*manufacturer)[j] = rb[50 + j]; - } - } - g_free (rb); - return result; + /* 0xXX: Reserved */ + /* 0xXX: Reserved */ + /* 0xXX: Reserved */ + /* 0xXX: Reserved */ + /* 0xXX: Byte 0 of model */ + /* 0xXX: Byte 1 of model */ + /* 0xXX: Byte 2 of model */ + /* 0xXX: Byte 3 of model */ + /* 0xXX: Byte 0 of serial number */ + /* 0xXX: Byte 1 of serial number */ + /* 0xXX: Byte 2 serial number */ + /* 0xXX: Byte 3 serial number */ + /* 0xXX: Byte 4 serial number */ + /* 0xXX: Byte 5 serial number */ + /* 0xXX: Byte 6 serial number */ + /* 0xXX: Byte 7 serial number */ + /* 0xXX: Byte 8 serial number */ + /* 0xXX: Byte 9 serial number */ + /* 0xXX: Hardware version (major) */ + /* 0xXX: Hardware version (minor) */ + /* 0xXX: Software version (major) */ + /* 0xXX: Software version (minor) */ + /* 0xXX: Testing software version (major) */ + /* 0xXX: Testing software version (minor) */ + /* 0xXX: Byte 0 of name */ + /* 0xXX: Byte 1 of name */ + /* 0xXX: Byte 2 of name */ + /* 0xXX: Byte 3 of name */ + /* 0xXX: Byte 4 of name */ + /* 0xXX: Byte 5 of name */ + /* 0xXX: Byte 6 of name */ + /* 0xXX: Byte 7 of name */ + /* 0xXX: Byte 8 of name */ + /* 0xXX: Byte 9 of name */ + /* 0xXX: Byte 10 of name */ + /* 0xXX: Byte 11 of name */ + /* 0xXX: Byte 12 of name */ + /* 0xXX: Byte 13 of name */ + /* 0xXX: Byte 14 of name */ + /* 0xXX: Byte 15 of name */ + /* 0xXX: Byte 16 of name */ + /* 0xXX: Byte 17 of name */ + /* 0xXX: Byte 18 of name */ + /* 0xXX: Byte 19 of name */ + /* 0xXX: Byte 20 of name */ + /* 0xXX: Byte 21 of name */ + /* 0xXX: Byte 0 of manufacturer */ + /* 0xXX: Byte 1 of manufacturer */ + /* 0xXX: Byte 2 of manufacturer */ + /* 0xXX: Byte 3 of manufacturer */ + /* 0xXX: Byte 4 of manufacturer */ + /* 0xXX: Byte 5 of manufacturer */ + /* 0xXX: Byte 6 of manufacturer */ + /* 0xXX: Byte 7 of manufacturer */ + /* 0xXX: Byte 8 of manufacturer */ + /* 0xXX: Byte 9 of manufacturer */ + /* 0xXX: Byte 10 of manufacturer */ + /* 0xXX: Byte 11 of manufacturer */ + /* 0xXX: Byte 12 of manufacturer */ + /* 0xXX: Byte 13 of manufacturer */ + /* 0xXX: Byte 14 of manufacturer */ + /* 0xXX: Byte 15 of manufacturer */ + /* 0xXX: Byte 16 of manufacturer */ + /* 0xXX: Byte 17 of manufacturer */ + /* 0xXX: Byte 18 of manufacturer */ + /* 0xXX: Byte 19 of manufacturer */ + /* 0xXX: Byte 20 of manufacturer */ + /* 0xXX: Byte 21 of manufacturer */ + /* 0xXX: Byte 22 of manufacturer */ + /* 0xXX: Byte 23 of manufacturer */ + /* 0xXX: Byte 24 of manufacturer */ + /* 0xXX: Byte 25 of manufacturer */ + /* 0xXX: Byte 26 of manufacturer */ + /* 0xXX: Byte 27 of manufacturer */ + /* 0xXX: Byte 28 of manufacturer */ + /* 0xXX: Byte 29 of manufacturer */ + /************************************************/ + guchar sb[] = {0x10, 0x90, 0x00, 0x00}; + guint i, j; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (model, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*model, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (serial_number, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*serial_number, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (hardware_version_major, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (hardware_version_minor, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (software_version_major, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (software_version_minor, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (testing_software_version_major, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (testing_software_version_minor, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (name, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*name, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (manufacturer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*manufacturer, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + /****************/ + /* Model */ + /****************/ + for (i = 0; i < 4; i++) if (rb[8 + i] == 0) break; + *model = g_new0 (gchar, i + 1); + for (j = 0; j < i; j++) (*model)[j] = rb[8 + j]; + /************************/ + /* Serial Number */ + /************************/ + for (i = 0; i < 10; i++) if (rb[12 + i] == 0) break; + *serial_number = g_new0 (gchar, i + 1); + for (j = 0; j < i; j++) + (*serial_number)[j] = rb[12 + j]; + /****************/ + /* Versions */ + /****************/ + *hardware_version_major = rb[22]; + *hardware_version_minor = rb[23]; + *software_version_major = rb[24]; + *software_version_minor = rb[25]; + *testing_software_version_major = rb[26]; + *testing_software_version_minor = rb[27]; + /****************/ + /* Name */ + /****************/ + for (i = 0; i < 22; i++) if (rb[28 + i] == 0) break; + *name = g_new0 (gchar, i + 1); + for (j = 0; j < i; j++) (*name)[j] = rb[28 + j]; + /****************/ + /* Manufacturer */ + /****************/ + for (i = 0; i < 30; i++) if (rb[50 + i] == 0) break; + *manufacturer = g_new0 (gchar, i + 1); + for (j = 0; j < i; j++) (*manufacturer)[j] = rb[50 + j]; + } + } + g_free (rb); + return result; } -gint +gint k_get_status ( - gp_port* device, - guint* self_test_result, - k_power_level_t* power_level, - k_power_source_t* power_source, - k_card_status_t* card_status, - k_display_t* display, - guint* card_size, - guint* pictures, - guint* pictures_left, - guchar* year, - guchar* month, - guchar* day, - guchar* hour, - guchar* minute, - guchar* second, - guint* io_setting_bit_rate, - guint* io_setting_flags, - guchar* flash, - guchar* resolution, - guchar* focus, - guchar* exposure, - guint* total_pictures, - guint* total_strobes) + gp_port* device, + guint* self_test_result, + k_power_level_t* power_level, + k_power_source_t* power_source, + k_card_status_t* card_status, + k_display_t* display, + guint* card_size, + guint* pictures, + guint* pictures_left, + guchar* year, + guchar* month, + guchar* day, + guchar* hour, + guchar* minute, + guchar* second, + guint* io_setting_bit_rate, + guint* io_setting_flags, + guchar* flash, + guchar* resolution, + guchar* focus, + guchar* exposure, + guint* total_pictures, + guint* total_strobes) { - /************************************************/ - /* Command to get the status of the camera. */ - /* */ - /* 0x20: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* (...) */ - /* */ - /* You can add pairs of additional bytes. If */ - /* those are all 0x00, then nothing will */ - /* change. If at least one deviates, all */ - /* individual pieces of the status information */ - /* will be returned as being zero. */ - /* */ - /* Return values: */ - /* 0x20: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to get the status of the camera. */ + /* */ + /* 0x20: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* (...) */ + /* */ + /* You can add pairs of additional bytes. If */ + /* those are all 0x00, then nothing will */ + /* change. If at least one deviates, all */ + /* individual pieces of the status information */ + /* will be returned as being zero. */ + /* */ + /* Return values: */ + /* 0x20: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Result of self test */ - /* 0x00: Self test passed */ - /* other: Self test failed */ - /* 0xXX: Power level */ - /* 0x00: Low */ - /* 0x01: Normal */ - /* 0x02: High */ - /* 0xXX: Power source */ - /* 0x00: Battery */ - /* 0x01: AC */ - /* 0xXX: Card status */ - /* 0x07: Card */ - /* 0x12: No card */ - /* 0xXX: Display */ - /* 0x00: built in */ - /* 0x02: TV */ - /* 0xXX: Byte 0 of card size */ - /* 0xXX: Byte 1 of card size */ - /* 0xXX: Byte 0 of pictures in camera */ - /* 0xXX: Byte 1 of left pictures in camera */ - /* 0xXX: Year */ - /* 0xXX: Month */ - /* 0xXX: Day */ - /* 0xXX: Hour */ - /* 0xXX: Minute */ - /* 0xXX: Second */ - /* 0xXX: Byte 0 of bit rates */ - /* 0xXX: Byte 1 of bit rates */ - /* 0xXX: Byte 0 of bit flags */ - /* 0xXX: Byte 1 of bit flags */ - /* 0xXX: Flash */ - /* 0xXX: Resolution */ - /* 0xXX: Focus */ - /* 0xXX: Exposure */ - /* 0xXX: Byte 0 of total pictures */ - /* 0xXX: Byte 1 of total pictures */ - /* 0xXX: Byte 0 of total strobes */ - /* 0xXX: Byte 1 of total strobes */ - /************************************************/ - guchar sb[] = {0x20, 0x90, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (self_test_result, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (power_level, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (power_source, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (card_status, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (display, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (card_size, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (pictures, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (pictures_left, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (year, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (month, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (day, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (hour, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (minute, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (second, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (io_setting_bit_rate, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (io_setting_flags, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (flash, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (resolution, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (focus, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (exposure, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (total_pictures, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (total_strobes, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *self_test_result = (rb[5] << 8) | rb[4]; - switch (rb[6]) { - case 0x00: - *power_level = K_POWER_LEVEL_LOW; - break; - case 0x01: - *power_level = K_POWER_LEVEL_NORMAL; - break; - case 0x02: - *power_level = K_POWER_LEVEL_HIGH; - break; - default: - power_level = NULL; - break; - } - switch (rb[7]) { - case 0x00: - *power_source = K_POWER_SOURCE_BATTERY; - break; - case 0x01: - *power_source = K_POWER_SOURCE_AC; - break; - default: - power_source = NULL; - break; - } - switch (rb[8]) { - case 0x07: - *card_status = K_CARD_STATUS_CARD; - break; - case 0x12: - *card_status = K_CARD_STATUS_NO_CARD; - break; - default: - card_status = NULL; - break; - } - switch (rb[9]) { - case 0x00: - *display = K_DISPLAY_BUILT_IN; - break; - case 0x02: - *display = K_DISPLAY_TV; - break; - default: - display = NULL; - break; - } - *card_size = (rb[11] << 8) | rb[10]; - *pictures = (rb[13] << 8) | rb[12]; - *pictures_left = (rb[15] << 8) | rb[14]; - *year = rb[16]; - *month = rb[17]; - *day = rb[18]; - *hour = rb[19]; - *minute = rb[20]; - *second = rb[21]; - *io_setting_bit_rate = (rb[23] << 8) | rb[22]; - *io_setting_flags = (rb[25] << 8) | rb[24]; - *flash = rb[26]; - *resolution = rb[27]; - *focus = rb[28]; - *exposure = rb[29]; - *total_pictures = (rb[31] << 8) | rb[30]; - *total_strobes = (rb[33] << 8) | rb[32]; - } - } - g_free (rb); - return (result); + /* 0xXX: Result of self test */ + /* 0x00: Self test passed */ + /* other: Self test failed */ + /* 0xXX: Power level */ + /* 0x00: Low */ + /* 0x01: Normal */ + /* 0x02: High */ + /* 0xXX: Power source */ + /* 0x00: Battery */ + /* 0x01: AC */ + /* 0xXX: Card status */ + /* 0x07: Card */ + /* 0x12: No card */ + /* 0xXX: Display */ + /* 0x00: built in */ + /* 0x02: TV */ + /* 0xXX: Byte 0 of card size */ + /* 0xXX: Byte 1 of card size */ + /* 0xXX: Byte 0 of pictures in camera */ + /* 0xXX: Byte 1 of left pictures in camera */ + /* 0xXX: Year */ + /* 0xXX: Month */ + /* 0xXX: Day */ + /* 0xXX: Hour */ + /* 0xXX: Minute */ + /* 0xXX: Second */ + /* 0xXX: Byte 0 of bit rates */ + /* 0xXX: Byte 1 of bit rates */ + /* 0xXX: Byte 0 of bit flags */ + /* 0xXX: Byte 1 of bit flags */ + /* 0xXX: Flash */ + /* 0xXX: Resolution */ + /* 0xXX: Focus */ + /* 0xXX: Exposure */ + /* 0xXX: Byte 0 of total pictures */ + /* 0xXX: Byte 1 of total pictures */ + /* 0xXX: Byte 0 of total strobes */ + /* 0xXX: Byte 1 of total strobes */ + /************************************************/ + guchar sb[] = {0x20, 0x90, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (self_test_result, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (power_level, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (power_source, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (card_status, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (display, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (card_size, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (pictures, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (pictures_left, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (year, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (month, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (day, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (hour, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (minute, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (second, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (io_setting_bit_rate, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (io_setting_flags, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (flash, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (resolution, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (focus, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (exposure, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (total_pictures, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (total_strobes, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 6, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *self_test_result = (rb[5] << 8) | rb[4]; + switch (rb[6]) { + case 0x00: + *power_level = K_POWER_LEVEL_LOW; + break; + case 0x01: + *power_level = K_POWER_LEVEL_NORMAL; + break; + case 0x02: + *power_level = K_POWER_LEVEL_HIGH; + break; + default: + power_level = NULL; + break; + } + switch (rb[7]) { + case 0x00: + *power_source = K_POWER_SOURCE_BATTERY; + break; + case 0x01: + *power_source = K_POWER_SOURCE_AC; + break; + default: + power_source = NULL; + break; + } + switch (rb[8]) { + case 0x07: + *card_status = K_CARD_STATUS_CARD; + break; + case 0x12: + *card_status = K_CARD_STATUS_NO_CARD; + break; + default: + card_status = NULL; + break; + } + switch (rb[9]) { + case 0x00: + *display = K_DISPLAY_BUILT_IN; + break; + case 0x02: + *display = K_DISPLAY_TV; + break; + default: + display = NULL; + break; + } + *card_size = (rb[11] << 8) | rb[10]; + *pictures = (rb[13] << 8) | rb[12]; + *pictures_left = (rb[15] << 8) | rb[14]; + *year = rb[16]; + *month = rb[17]; + *day = rb[18]; + *hour = rb[19]; + *minute = rb[20]; + *second = rb[21]; + *io_setting_bit_rate = (rb[23] << 8) | rb[22]; + *io_setting_flags = (rb[25] << 8) | rb[24]; + *flash = rb[26]; + *resolution = rb[27]; + *focus = rb[28]; + *exposure = rb[29]; + *total_pictures = (rb[31] << 8) | rb[30]; + *total_strobes = (rb[33] << 8) | rb[32]; + } + } + g_free (rb); + return (result); } -gint +gint k_get_date_and_time ( - gp_port* device, - guchar* year, - guchar* month, - guchar* day, - guchar* hour, - guchar* minute, - guchar* second) + gp_port* device, + guchar* year, + guchar* month, + guchar* day, + guchar* hour, + guchar* minute, + guchar* second) { - /************************************************/ - /* Command to get the date and time from the */ - /* camera. */ - /* */ - /* 0x30: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* */ - /* Return values: */ - /* 0x30: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to get the date and time from the */ + /* camera. */ + /* */ + /* 0x30: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* */ + /* Return values: */ + /* 0x30: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Year */ - /* 0xXX: Month */ - /* 0xXX: Day */ - /* 0xXX: Hour */ - /* 0xXX: Minute */ - /* 0xXX: Second */ - /************************************************/ - guchar sb[] = {0x30, 0x90, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (year, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (month, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (day, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (hour, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (minute, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (second, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *year = rb[4]; - *month = rb[5]; - *day = rb[6]; - *hour = rb[7]; - *minute = rb[8]; - *second = rb[9]; - } - } - g_free (rb); - return (result); + /* 0xXX: Year */ + /* 0xXX: Month */ + /* 0xXX: Day */ + /* 0xXX: Hour */ + /* 0xXX: Minute */ + /* 0xXX: Second */ + /************************************************/ + guchar sb[] = {0x30, 0x90, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (year, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (month, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (day, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (hour, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (minute, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (second, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *year = rb[4]; + *month = rb[5]; + *day = rb[6]; + *hour = rb[7]; + *minute = rb[8]; + *second = rb[9]; + } + } + g_free (rb); + return (result); }; -gint +gint k_get_preferences ( - gp_port* device, - guint* shutoff_time, - guint* self_timer_time, - guint* beep, - guint* slide_show_interval) + gp_port* device, + guint* shutoff_time, + guint* self_timer_time, + guint* beep, + guint* slide_show_interval) { - /************************************************/ - /* Command to get the preferences from the */ - /* camera. */ - /* */ - /* 0x40: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* */ - /* Return values: */ - /* 0x40: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to get the preferences from the */ + /* camera. */ + /* */ + /* 0x40: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* */ + /* Return values: */ + /* 0x40: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Byte 0 of shutoff time */ - /* 0xXX: Byte 1 of shutoff time */ - /* 0xXX: Byte 0 of self timer time */ - /* 0xXX: Byte 1 of self timer time */ - /* 0xXX: Byte 0 of beep */ - /* 0xXX: Byte 1 of beep */ - /* 0xXX: Byte 0 of slide show interval */ - /* 0xXX: Byte 1 of slide show interval */ - /************************************************/ - guchar sb[] = {0x40, 0x90, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (shutoff_time, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (self_timer_time, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (beep, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (slide_show_interval, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - *shutoff_time = rb[4]; - *self_timer_time = rb[5]; - *beep = rb[6]; - *slide_show_interval = rb[7]; - } - } - g_free (rb); - return (result); + /* 0xXX: Byte 0 of shutoff time */ + /* 0xXX: Byte 1 of shutoff time */ + /* 0xXX: Byte 0 of self timer time */ + /* 0xXX: Byte 1 of self timer time */ + /* 0xXX: Byte 0 of beep */ + /* 0xXX: Byte 1 of beep */ + /* 0xXX: Byte 0 of slide show interval */ + /* 0xXX: Byte 1 of slide show interval */ + /************************************************/ + guchar sb[] = {0x40, 0x90, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (shutoff_time, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (self_timer_time, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (beep, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (slide_show_interval, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + *shutoff_time = rb[4]; + *self_timer_time = rb[5]; + *beep = rb[6]; + *slide_show_interval = rb[7]; + } + } + g_free (rb); + return (result); } -gint +gint k_set_io_capability ( - gp_port* device, - guint bit_rate, - gboolean bit_flag_7_or_8_bits, - gboolean bit_flag_stop_2_bits, - gboolean bit_flag_parity_on, - gboolean bit_flag_parity_odd, - gboolean bit_flag_use_hw_flow_control) + gp_port* device, + guint bit_rate, + gboolean bit_flag_7_or_8_bits, + gboolean bit_flag_stop_2_bits, + gboolean bit_flag_parity_on, + gboolean bit_flag_parity_odd, + gboolean bit_flag_use_hw_flow_control) { - /************************************************/ - /* Command to set the IO capability of the */ - /* camera. */ - /* */ - /* 0x80: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of bit rates */ - /* 0xXX: Byte 1 of bit rates */ - /* 0xXX: Byte 0 of bit flags */ - /* 0xXX: Byte 1 of bit flags */ - /* */ - /* Return values: */ - /* 0x80: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0x80, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - switch (bit_rate) { - case 300: - sb[4] = (1 << 0); - break; - case 600: - sb[4] = (1 << 1); - break; - case 1200: - sb[4] = (1 << 2); - break; - case 2400: - sb[4] = (1 << 3); - break; - case 4800: - sb[4] = (1 << 4); - break; - case 9600: - sb[4] = (1 << 5); - break; - case 19200: - sb[4] = (1 << 6); - break; - case 38400: - sb[4] = (1 << 7); - break; - case 57600: - sb[5] = (1 << 0); - break; - case 115200: - sb[5] = (1 << 1); - break; - default: - return (GP_ERROR_NOT_SUPPORTED); - } - sb[6] = (bit_flag_7_or_8_bits | (bit_flag_stop_2_bits << 1) | (bit_flag_parity_on << 2) | (bit_flag_parity_odd << 3) | (bit_flag_use_hw_flow_control << 4)); - result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + /************************************************/ + /* Command to set the IO capability of the */ + /* camera. */ + /* */ + /* 0x80: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of bit rates */ + /* 0xXX: Byte 1 of bit rates */ + /* 0xXX: Byte 0 of bit flags */ + /* 0xXX: Byte 1 of bit flags */ + /* */ + /* Return values: */ + /* 0x80: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0x80, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + switch (bit_rate) { + case 300: + sb[4] = (1 << 0); + break; + case 600: + sb[4] = (1 << 1); + break; + case 1200: + sb[4] = (1 << 2); + break; + case 2400: + sb[4] = (1 << 3); + break; + case 4800: + sb[4] = (1 << 4); + break; + case 9600: + sb[4] = (1 << 5); + break; + case 19200: + sb[4] = (1 << 6); + break; + case 38400: + sb[4] = (1 << 7); + break; + case 57600: + sb[5] = (1 << 0); + break; + case 115200: + sb[5] = (1 << 1); + break; + default: + return (GP_ERROR_NOT_SUPPORTED); + } + sb[6] = (bit_flag_7_or_8_bits | (bit_flag_stop_2_bits << 1) | (bit_flag_parity_on << 2) | (bit_flag_parity_odd << 3) | (bit_flag_use_hw_flow_control << 4)); + result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } -gint +gint k_set_date_and_time (gp_port* device, guchar year, guchar month, guchar day, guchar hour, guchar minute, guchar second) { - /************************************************/ - /* Command to set date and time of the camera. */ - /* */ - /* 0xb0: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Year (0x00 to 0x25, 0x60 to 0x63) */ - /* 0xXX: Month (0x01 to 0x0C) */ - /* 0xXX: Day (0x01 to 0x1F) */ - /* 0xXX: Hour (0x00 to 0x17) */ - /* 0xXX: Minute (0x00 to 0x3b) */ - /* 0xXX: Second (0x00 to 0x3b) */ - /* */ - /* Return values: */ - /* 0xb0: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0xb0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; + /************************************************/ + /* Command to set date and time of the camera. */ + /* */ + /* 0xb0: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Year (0x00 to 0x25, 0x60 to 0x63) */ + /* 0xXX: Month (0x01 to 0x0C) */ + /* 0xXX: Day (0x01 to 0x1F) */ + /* 0xXX: Hour (0x00 to 0x17) */ + /* 0xXX: Minute (0x00 to 0x3b) */ + /* 0xXX: Second (0x00 to 0x3b) */ + /* */ + /* Return values: */ + /* 0xb0: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0xb0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; sb[4] = year; sb[5] = month; @@ -1203,181 +1203,181 @@ k_set_date_and_time (gp_port* device, guchar year, guchar month, guchar day, guc sb[8] = minute; sb[9] = second; result = l_send_receive (device, sb, 10, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } -gint +gint k_set_preference (gp_port* device, k_preference_t preference, guint value) { - /************************************************/ - /* Command to set a preference of the camera. */ - /* */ - /* 0xc0: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0xXX: Byte 0 of preference */ - /* 0xXX: Byte 1 of preference */ - /* */ - /* Return values: */ - /* 0xc0: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0xc0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - switch (preference) { - case K_PREFERENCE_RESOLUTION: - sb[4] = 0x00; - sb[5] = 0xc0; - break; - case K_PREFERENCE_EXPOSURE: - sb[4] = 0x02; - sb[5] = 0xc0; - break; - case K_PREFERENCE_SELF_TIMER_TIME: - sb[4] = 0x04; - sb[5] = 0xc0; - break; - case K_PREFERENCE_SLIDE_SHOW_INTERVAL: - sb[4] = 0x06; - sb[5] = 0xc0; - break; - case K_PREFERENCE_FLASH: - sb[4] = 0x00; - sb[5] = 0xd0; - break; - case K_PREFERENCE_FOCUS_SELF_TIMER: - sb[4] = 0x02; - sb[5] = 0xd0; - break; - case K_PREFERENCE_AUTO_OFF_TIME: - sb[4] = 0x04; - sb[5] = 0xd0; - break; - case K_PREFERENCE_BEEP: - sb[4] = 0x06; - sb[5] = 0xd0; - } + /************************************************/ + /* Command to set a preference of the camera. */ + /* */ + /* 0xc0: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0xXX: Byte 0 of preference */ + /* 0xXX: Byte 1 of preference */ + /* */ + /* Return values: */ + /* 0xc0: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0xc0, 0x90, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + switch (preference) { + case K_PREFERENCE_RESOLUTION: + sb[4] = 0x00; + sb[5] = 0xc0; + break; + case K_PREFERENCE_EXPOSURE: + sb[4] = 0x02; + sb[5] = 0xc0; + break; + case K_PREFERENCE_SELF_TIMER_TIME: + sb[4] = 0x04; + sb[5] = 0xc0; + break; + case K_PREFERENCE_SLIDE_SHOW_INTERVAL: + sb[4] = 0x06; + sb[5] = 0xc0; + break; + case K_PREFERENCE_FLASH: + sb[4] = 0x00; + sb[5] = 0xd0; + break; + case K_PREFERENCE_FOCUS_SELF_TIMER: + sb[4] = 0x02; + sb[5] = 0xd0; + break; + case K_PREFERENCE_AUTO_OFF_TIME: + sb[4] = 0x04; + sb[5] = 0xd0; + break; + case K_PREFERENCE_BEEP: + sb[4] = 0x06; + sb[5] = 0xd0; + } sb[6] = value; sb[7] = value >> 8; result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } -gint +gint k_reset_preferences (gp_port* device) { - /************************************************/ - /* Command to reset the preferences of the */ - /* camera. */ - /* */ - /* 0xc1: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* */ - /* Return values: */ - /* 0xc1: Byte 0 of command identifier */ - /* 0x90: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - guchar sb[] = {0xc1, 0x90, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; + /************************************************/ + /* Command to reset the preferences of the */ + /* camera. */ + /* */ + /* 0xc1: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* */ + /* Return values: */ + /* 0xc1: Byte 0 of command identifier */ + /* 0x90: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + guchar sb[] = {0xc1, 0x90, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - return (result); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + return (result); } -gint +gint k_take_picture ( - gp_port* device, - gboolean image_id_long, - gulong* image_id, - guint* exif_size, - guchar** information_buffer, - guint* information_buffer_size, - gboolean* protected) + gp_port* device, + gboolean image_id_long, + gulong* image_id, + guint* exif_size, + guchar** information_buffer, + guint* information_buffer_size, + gboolean* protected) { - /************************************************/ - /* Command to take a picture. */ - /* */ - /* 0x00: Byte 0 of command identifier */ - /* 0x91: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* 0x02: Byte 0 of device ID */ - /* 0x00: Byte 1 of device ID */ - /* */ - /* The data (thumbnail) will be received first, */ - /* followed by the return values. */ - /* */ - /* Return values: */ - /* 0x00: Byte 0 of command identifier */ - /* 0x91: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to take a picture. */ + /* */ + /* 0x00: Byte 0 of command identifier */ + /* 0x91: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* 0x02: Byte 0 of device ID */ + /* 0x00: Byte 1 of device ID */ + /* */ + /* The data (thumbnail) will be received first, */ + /* followed by the return values. */ + /* */ + /* Return values: */ + /* 0x00: Byte 0 of command identifier */ + /* 0x91: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Byte 3 of image ID (QM200 only) */ - /* 0xXX: Byte 4 of image ID (QM200 only) */ - /* 0xXX: Byte 0 of image ID */ - /* 0xXX: Byte 1 of image ID */ - /* 0xXX: Byte 0 of exif size */ - /* 0xXX: Byte 1 of exif size */ - /* 0xXX: Byte 0 of protect status */ - /* 0x00: not protected */ - /* 0x01: protected */ - /* 0x00: Byte 1 of protect status */ - /************************************************/ - guchar sb[] = {0x00, 0x91, 0x00, 0x00, 0x02, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (image_id, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (exif_size, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (protected, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (information_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (!*information_buffer, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (information_buffer_size, GP_ERROR_BAD_PARAMETERS); - - result = l_send_receive (device, sb, 6, &rb, &rbs, 60000, information_buffer, information_buffer_size); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) { - if (!image_id_long) { - *image_id = 0x00 | 0x00 | (rb[5] << 8) | rb[4]; - *exif_size = (rb[7] << 8) | rb[6]; - *protected = (rb[8] != 0x00); - } else { - *image_id = (rb[5] << 24) | (rb[4] << 16) | (rb[7] << 8) | (rb[6]); - *exif_size = (rb[9] << 8) | rb[8]; - *protected = (rb[10] != 0x00); - } - } - } - g_free (rb); - return (result); + /* 0xXX: Byte 3 of image ID (QM200 only) */ + /* 0xXX: Byte 4 of image ID (QM200 only) */ + /* 0xXX: Byte 0 of image ID */ + /* 0xXX: Byte 1 of image ID */ + /* 0xXX: Byte 0 of exif size */ + /* 0xXX: Byte 1 of exif size */ + /* 0xXX: Byte 0 of protect status */ + /* 0x00: not protected */ + /* 0x01: protected */ + /* 0x00: Byte 1 of protect status */ + /************************************************/ + guchar sb[] = {0x00, 0x91, 0x00, 0x00, 0x02, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (image_id, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (exif_size, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (protected, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (information_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (!*information_buffer, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (information_buffer_size, GP_ERROR_BAD_PARAMETERS); + + result = l_send_receive (device, sb, 6, &rb, &rbs, 60000, information_buffer, information_buffer_size); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) { + if (!image_id_long) { + *image_id = 0x00 | 0x00 | (rb[5] << 8) | rb[4]; + *exif_size = (rb[7] << 8) | rb[6]; + *protected = (rb[8] != 0x00); + } else { + *image_id = (rb[5] << 24) | (rb[4] << 16) | (rb[7] << 8) | (rb[6]); + *exif_size = (rb[9] << 8) | rb[8]; + *protected = (rb[10] != 0x00); + } + } + } + g_free (rb); + return (result); } -gint +gint k_localization_tv_output_format_set (gp_port* device, k_tv_output_format_t tv_output_format) { /************************************************/ @@ -1391,8 +1391,8 @@ k_localization_tv_output_format_set (gp_port* device, k_tv_output_format_t tv_ou /* 0x01: Byte 0 of localization type identifier */ /* 0x00: transmission of */ /* localization data */ - /* 0x01: setting of tv output */ - /* format */ + /* 0x01: setting of tv output */ + /* format */ /* 0x02: setting of date format */ /* 0x00: Byte 1 of localization type identifier */ /* 0xXX: Byte 0 of tv output format */ @@ -1407,10 +1407,10 @@ k_localization_tv_output_format_set (gp_port* device, k_tv_output_format_t tv_ou /* 0xXX: Byte 0 of return status */ /* 0xXX: Byte 1 of return status */ /************************************************/ - guchar sb[] = {0x00, 0x92, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; + guchar sb[] = {0x00, 0x92, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; switch (tv_output_format) { case K_TV_OUTPUT_FORMAT_NTSC: @@ -1422,8 +1422,8 @@ k_localization_tv_output_format_set (gp_port* device, k_tv_output_format_t tv_ou case K_TV_OUTPUT_FORMAT_HIDE: sb[6] = 0x02; break; - default: - return (GP_ERROR_BAD_PARAMETERS); + default: + return (GP_ERROR_BAD_PARAMETERS); } result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); @@ -1432,12 +1432,12 @@ k_localization_tv_output_format_set (gp_port* device, k_tv_output_format_t tv_ou } -gint +gint k_localization_date_format_set (gp_port* device, k_date_format_t date_format) { /************************************************/ /* Command for various localization issues. */ - /* Here: Setting of date format. */ + /* Here: Setting of date format. */ /* */ /* 0x00: Byte 0 of command identifier */ /* 0x92: Byte 1 of command identifier */ @@ -1450,36 +1450,36 @@ k_localization_date_format_set (gp_port* device, k_date_format_t date_format) /* format */ /* 0x02: setting of date format */ /* 0x00: Byte 1 of localization type identifier */ - /* 0xXX: Byte 0 of date format */ - /* 0x00: month/day/year */ - /* 0x01: day/month/year */ - /* 0x02: year/month/day */ + /* 0xXX: Byte 0 of date format */ + /* 0x00: month/day/year */ + /* 0x01: day/month/year */ + /* 0x02: year/month/day */ /* 0x00: Byte 1 of date format */ - /* */ + /* */ /* Return values: */ /* 0x00: Byte 0 of command identifier */ /* 0x92: Byte 1 of command identifier */ /* 0xXX: Byte 0 of return status */ /* 0xXX: Byte 1 of return status */ /************************************************/ - guchar sb[] = {0x00, 0x92, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - switch (date_format) { - case K_DATE_FORMAT_MONTH_DAY_YEAR: - sb[6] = 0x00; - break; - case K_DATE_FORMAT_DAY_MONTH_YEAR: - sb[6] = 0x01; - break; - case K_DATE_FORMAT_YEAR_MONTH_DAY: - sb[6] = 0x02; - break; - default: - return (GP_ERROR_BAD_PARAMETERS); - } + guchar sb[] = {0x00, 0x92, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + switch (date_format) { + case K_DATE_FORMAT_MONTH_DAY_YEAR: + sb[6] = 0x00; + break; + case K_DATE_FORMAT_DAY_MONTH_YEAR: + sb[6] = 0x01; + break; + case K_DATE_FORMAT_YEAR_MONTH_DAY: + sb[6] = 0x02; + break; + default: + return (GP_ERROR_BAD_PARAMETERS); + } result = l_send_receive (device, sb, 8, &rb, &rbs, 0, NULL, NULL); if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); g_free (rb); @@ -1487,17 +1487,17 @@ k_localization_date_format_set (gp_port* device, k_date_format_t date_format) } -gint +gint k_localization_data_put (gp_port* device, guchar* data, gulong data_size) { - /************************************************/ + /************************************************/ /* Command for various localization issues. */ - /* Here: Transmission of localization data. */ - /* */ - /* 0x00: Byte 0 of command identifier */ - /* 0x92: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ + /* Here: Transmission of localization data. */ + /* */ + /* 0x00: Byte 0 of command identifier */ + /* 0x92: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ /* 0x00: Byte 0 of localization type identifier */ /* 0x00: transmission of */ /* localization data */ @@ -1507,126 +1507,126 @@ k_localization_data_put (gp_port* device, guchar* data, gulong data_size) /* 0x00: Byte 1 of localization type identifier */ /* 0x00: Byte 0 of ? */ /* 0x00: Byte 1 of ? */ - /* 0xXX: Byte 0 of number of bytes of packet */ - /* 0xXX: Byte 1 of number of bytes of packet */ - /* 0xXX: Byte 3 of memory address where to */ - /* write the packet to */ - /* 0xXX: Byte 4 of memory address */ - /* 0xXX: Byte 0 of memory address */ - /* 0xXX: Byte 1 of memory address */ - /* 0xXX: Byte 0 of last packet identifier */ - /* 0x00: packets to follow */ - /* 0x01: no more packets to follow */ - /* 0x00: Byte 1 of last packet identifier */ - /* */ - /* Then follows the packet (size see above). */ - /* */ - /* */ - /* Return values: */ - /* 0x00: Byte 0 of command identifier */ - /* 0x92: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ - /************************************************/ - gint result; - guchar* rb = NULL; - guint rbs; - gulong i, j; - static guint packet_size = 1024; - guchar sb[16 + packet_size]; - - g_return_val_if_fail (data_size >= 512, GP_ERROR_BAD_PARAMETERS); - g_return_val_if_fail (data, GP_ERROR_BAD_PARAMETERS); - - sb[0] = 0x00; - sb[1] = 0x92; - sb[2] = 0x00; - sb[3] = 0x00; - sb[4] = 0x00; - sb[5] = 0x00; - sb[6] = 0x00; - sb[7] = 0x00; - sb[8] = packet_size; - sb[9] = packet_size >> 8; - sb[10] = 0x00; - sb[11] = 0x00; - sb[12] = 0x00; - sb[13] = 0x00; - sb[14] = 0x00; - sb[15] = 0x00; - i = 0; - while (TRUE) { - /* Set up the packet. */ - sb[10] = i >> 16; - sb[11] = i >> 24; - sb[12] = i; - sb[13] = i >> 8; + /* 0xXX: Byte 0 of number of bytes of packet */ + /* 0xXX: Byte 1 of number of bytes of packet */ + /* 0xXX: Byte 3 of memory address where to */ + /* write the packet to */ + /* 0xXX: Byte 4 of memory address */ + /* 0xXX: Byte 0 of memory address */ + /* 0xXX: Byte 1 of memory address */ + /* 0xXX: Byte 0 of last packet identifier */ + /* 0x00: packets to follow */ + /* 0x01: no more packets to follow */ + /* 0x00: Byte 1 of last packet identifier */ + /* */ + /* Then follows the packet (size see above). */ + /* */ + /* */ + /* Return values: */ + /* 0x00: Byte 0 of command identifier */ + /* 0x92: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ + /************************************************/ + gint result; + guchar* rb = NULL; + guint rbs; + gulong i, j; + static guint packet_size = 1024; + guchar sb[16 + packet_size]; + + g_return_val_if_fail (data_size >= 512, GP_ERROR_BAD_PARAMETERS); + g_return_val_if_fail (data, GP_ERROR_BAD_PARAMETERS); + + sb[0] = 0x00; + sb[1] = 0x92; + sb[2] = 0x00; + sb[3] = 0x00; + sb[4] = 0x00; + sb[5] = 0x00; + sb[6] = 0x00; + sb[7] = 0x00; + sb[8] = packet_size; + sb[9] = packet_size >> 8; + sb[10] = 0x00; + sb[11] = 0x00; + sb[12] = 0x00; + sb[13] = 0x00; + sb[14] = 0x00; + sb[15] = 0x00; + i = 0; + while (TRUE) { + /* Set up the packet. */ + sb[10] = i >> 16; + sb[11] = i >> 24; + sb[12] = i; + sb[13] = i >> 8; for (j = 0; j < packet_size; j++) { if ((i + j) < data_size) sb[16 + j] = data[i + j]; else sb[16 + j] = 0xFF; } - /********************************************************/ - /* We could wait until the camera sends us */ - /* K_ERROR_LOCALIZATION_DATA_EXCESS, but it does that */ - /* not until the 70000th byte or so. However, as we can */ - /* provoke the message with sb[14] = 0x01, we do so as */ - /* soon as we exceed the 65535th byte to shorten the */ - /* transmission time. We can't do that before or the */ - /* camera reports K_ERROR_LOCALIZATION_DATA_CORRUPT. */ - /********************************************************/ - if (i + packet_size > 65536) sb[14] = 0x01; - result = l_send_receive (device, sb, packet_size + 16, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); - g_free (rb); - switch (result) { - case GP_OK: - /* Everything is fine. Continue sending packets. However, make sure we don't loop forever. */ - if (i > 131072) return (GP_ERROR_BAD_PARAMETERS); - break; - case KONICA_ERROR_LOCALIZATION_DATA_EXCESS: - /* The camera does no longer want to receive localization data. We are done. */ - return (GP_OK); - default: - /* Something went wrong. */ - return (result); - } - i += packet_size; - } + /********************************************************/ + /* We could wait until the camera sends us */ + /* K_ERROR_LOCALIZATION_DATA_EXCESS, but it does that */ + /* not until the 70000th byte or so. However, as we can */ + /* provoke the message with sb[14] = 0x01, we do so as */ + /* soon as we exceed the 65535th byte to shorten the */ + /* transmission time. We can't do that before or the */ + /* camera reports K_ERROR_LOCALIZATION_DATA_CORRUPT. */ + /********************************************************/ + if (i + packet_size > 65536) sb[14] = 0x01; + result = l_send_receive (device, sb, packet_size + 16, &rb, &rbs, 0, NULL, NULL); + if (result == GP_OK) result = GP_RESULT (rb[2], rb[3]); + g_free (rb); + switch (result) { + case GP_OK: + /* Everything is fine. Continue sending packets. However, make sure we don't loop forever. */ + if (i > 131072) return (GP_ERROR_BAD_PARAMETERS); + break; + case KONICA_ERROR_LOCALIZATION_DATA_EXCESS: + /* The camera does no longer want to receive localization data. We are done. */ + return (GP_OK); + default: + /* Something went wrong. */ + return (result); + } + i += packet_size; + } } -gint +gint k_cancel (gp_port* device, k_command_t* command) { - /************************************************/ - /* Command to cancel a command. */ - /* */ - /* 0x00: Byte 0 of command identifier */ - /* 0x9e: Byte 1 of command identifier */ - /* 0x00: Reserved */ - /* 0x00: Reserved */ - /* */ - /* Return values: */ - /* 0x00: Byte 0 of command identifier */ - /* 0x9e: Byte 1 of command identifier */ - /* 0xXX: Byte 0 of return status */ - /* 0xXX: Byte 1 of return status */ + /************************************************/ + /* Command to cancel a command. */ + /* */ + /* 0x00: Byte 0 of command identifier */ + /* 0x9e: Byte 1 of command identifier */ + /* 0x00: Reserved */ + /* 0x00: Reserved */ + /* */ + /* Return values: */ + /* 0x00: Byte 0 of command identifier */ + /* 0x9e: Byte 1 of command identifier */ + /* 0xXX: Byte 0 of return status */ + /* 0xXX: Byte 1 of return status */ /* Following bytes only in case of success. */ - /* 0xXX: Byte 0 of cancelled command */ - /* 0xXX: Byte 1 of cancelled command */ - /************************************************/ - guchar sb[] = {0x00, 0x9e, 0x00, 0x00}; - gint result; - guchar* rb = NULL; - guint rbs; - - g_return_val_if_fail (command, GP_ERROR_BAD_PARAMETERS); - + /* 0xXX: Byte 0 of cancelled command */ + /* 0xXX: Byte 1 of cancelled command */ + /************************************************/ + guchar sb[] = {0x00, 0x9e, 0x00, 0x00}; + gint result; + guchar* rb = NULL; + guint rbs; + + g_return_val_if_fail (command, GP_ERROR_BAD_PARAMETERS); + result = l_send_receive (device, sb, 4, &rb, &rbs, 0, NULL, NULL); - if (result == GP_OK) { - result = GP_RESULT (rb[2], rb[3]); - if (result == GP_OK) *command = (rb[5] << 8) | rb[4]; - } - g_free (rb); - return (result); + if (result == GP_OK) { + result = GP_RESULT (rb[2], rb[3]); + if (result == GP_OK) *command = (rb[5] << 8) | rb[4]; + } + g_free (rb); + return (result); } diff --git a/camlibs/konica/makefile.os2 b/camlibs/konica/makefile.os2 index df8616922..4d6ced87b 100644 --- a/camlibs/konica/makefile.os2 +++ b/camlibs/konica/makefile.os2 @@ -1,36 +1,22 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgpio -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -DEBUG -IC:\xfree86\include\glib12 -CC=gcc +BASEPATH=..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** - -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +!include $(BASEPATH)\OS2MAK.INC dll: ..\gpkonica.dll -konica.o : konica.c konica.h - @$(CC) -o $@ konica.c $(CCFLAGS) - -lowlevel.o : lowlevel.c lowlevel.h - @$(CC) -o $@ lowlevel.c $(CCFLAGS) - -libary.o : libary.c - @$(CC) -o $@ libary.c $(CCFLAGS) +OBJS=konica.o \ + lowlevel.o \ + library.o \ +.c.o : + @$(CC) -o $@ $< $(CCFLAGS) -konica.def: konica.o - @copy konica.df konica.def - @emxexp $** >> konica.def +konica.def: library.o + $(MAKEDEF) -..\gpkonica.dll: konica.o konica.def command.o libary.o ..\..\obj\interface.o - @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lst\check -lgcc -L..\..\LIB -llibgphoto2 -llibgpio -ldl -lpthreads -lpthrdrtl -lmt\c +..\gpkonica.dll:konica.def $(OBJS) + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) -LC:\XFREE86\LIB -lglib12 diff --git a/camlibs/minolta/dimagev/dimagev.df b/camlibs/minolta/dimagev/dimagev.df index 0ff51ca96..705f3b1e3 100644 --- a/camlibs/minolta/dimagev/dimagev.df +++ b/camlibs/minolta/dimagev/dimagev.df @@ -1,2 +1,2 @@ -LIBRARY GPDSCF1 +LIBRARY GPMINOLT EXPORTS diff --git a/camlibs/minolta/dimagev/makefile.os2 b/camlibs/minolta/dimagev/makefile.os2 index 8d4633b82..fc5c2f211 100644 --- a/camlibs/minolta/dimagev/makefile.os2 +++ b/camlibs/minolta/dimagev/makefile.os2 @@ -1,53 +1,28 @@ -CCFLAGS=-O2 -c -I.. -I..\..\..\include -I..\..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\OS2MAK.INC -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +dll: $(CAMLIBS)\gpminolt.dll -dll: ..\..\gpminolt.dll +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) -util.o : util.c - $(CC) -o $@ util.c $(CCFLAGS) - -info.o : info.c - $(CC) -o $@ info.c $(CCFLAGS) - -data.o : data.c - $(CC) -o $@ data.c $(CCFLAGS) - -packet.o : packet.c - $(CC) -o $@ packet.c $(CCFLAGS) - -status.o : status.c - $(CC) -o $@ status.c $(CCFLAGS) - -delete.o : delete.c - $(CC) -o $@ delete.c $(CCFLAGS) - -download.o : download.c - $(CC) -o $@ download.c $(CCFLAGS) - -dimagev.o : dimagev.c - $(CC) -o $@ dimagev.c $(CCFLAGS) - -capture.o : capture.c - $(CC) -o $@ capture.c $(CCFLAGS) +OBJS= util.o \ + info.o \ + data.o \ + packet.o \ + delete.o \ + download.o \ + capture.o \ + status.o \ + dimagev.o dimagev.def: dimagev.o - copy dimagev.df dimagev.def - emxexp $** >> dimagev.def + @$(MAKEDEF) -..\..\gpminolt.dll: util.o dimagev.def info.o data.o packet.o delete.o download.o capture.o status.o dimagev.o - $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +$(CAMLIBS)\gpminolt.dll: $(OBJS) dimagev.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/panasonic/makefile.os2 b/camlibs/panasonic/makefile.os2 index 441ba786c..1900b4752 100644 --- a/camlibs/panasonic/makefile.os2 +++ b/camlibs/panasonic/makefile.os2 @@ -1,33 +1,29 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\.. all: start \ - dll \ + dll1000 \ + dll1580 \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\OS2MAK.INC -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +dll1000: ..\gpdc1000.dll +dll1580: ..\gpdc1580.dll -dll: ..\gppanson.dll +OBJS1000=dc.o dc1000.o +OBJS1580=dc.o dc1580.o -dc.o : dc.c - $(CC) -o $@ dc.c $(CCFLAGS) +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) -dc1580.o : dc1580.c - $(CC) -o $@ dc1580.c $(CCFLAGS) +dc1000.def: dc1000.o + @$(MAKEDEF) +..\gpdc1000.dll: $(OBJS1000) dc1000.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) -panasonic.def: dc1580.o - copy panasonic.df panasonic.def - emxexp $** >> panasonic.def +dc1580.def: dc1580.o + @$(MAKEDEF) -..\gppanson.dll: dc.o panasonic.def dc1580.o - $(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +..\gpdc1580.dll: $(OBJS1580) dc1580.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/camlibs/sierra/makefile.os2 b/camlibs/sierra/makefile.os2 index 82817a999..af0b59fcd 100644 --- a/camlibs/sierra/makefile.os2 +++ b/camlibs/sierra/makefile.os2 @@ -1,32 +1,20 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -DEBUG -CC=gcc +BASEPATH=..\.. all: start \ dll \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** - -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +!include $(BASEPATH)\OS2MAK.INC dll: ..\gpsierra.dll -library.o : library.c library.h - @$(CC) -o $@ library.c $(CCFLAGS) +OBJS=sierra.o library.o -sierra.o : sierra.c - @$(CC) -o $@ sierra.c $(CCFLAGS) +.c.o : + @$(CC) -o $@ $< $(CCFLAGS) sierra.def: sierra.o - @copy sierra.df sierra.def - @emxexp $** >> sierra.def + @$(MAKEDEF) -..\gpsierra.dll: sierra.o sierra.def library.o - @$(CC) -g -Wall -Zdll -Zcrtdll -o $@ $** -lwrap -lgcc -L..\..\LIB -llibgphoto2 -llibgphoto2_port -ldllib +..\gpsierra.dll: $(OBJS) sierra.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/frontends/command-line/makefile.os2 b/frontends/command-line/makefile.os2 index 678ccfbc1..ece37fd83 100644 --- a/frontends/command-line/makefile.os2 +++ b/frontends/command-line/makefile.os2 @@ -1,45 +1,25 @@ -CCFLAGS=-O2 -c -I.. -I..\..\libgphoto2_port\include -I..\..\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\.. all: start \ cmdline \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo **** +!include $(BASEPATH)\os2mak.inc -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +OBJS=$(OBJPATH)\interface.o \ + $(OBJPATH)\script.o \ + $(OBJPATH)\main.o \ + $(OBJPATH)\test.o \ + $(OBJPATH)\actions.o \ + $(OBJPATH)\shell.o \ + $(OBJPATH)\foreach.o \ + $(OBJPATH)\options.o \ + $(OBJPATH)\range.o -cmdline: ..\..\gphoto2.exe +cmdline: $(BASEPATH)\gphoto2.exe -..\..\obj\interface.o: interface.c - @$(CC) -o $@ $** $(CCFLAGS) +.c{$(OBJPATH)}.o: + @$(CC) -o $(OBJPATH)\$(@B).o $< $(CCFLAGS) -..\..\obj\main.o: main.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\test.o: test.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\shell.o: shell.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\range.o: range.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\actions.o: actions.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\options.o: options.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\obj\foreach.o: foreach.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\..\gphoto2.exe: ..\..\obj\interface.o ..\..\obj\script.o ..\..\obj\main.o ..\..\obj\test.o ..\..\obj\actions.o ..\..\obj\shell.o ..\..\obj\foreach.o ..\..\obj\options.o ..\..\obj\range.o - @$(CC) -O2 $** -o $@ -Zmtd -Zcrtdll -L..\..\lib -Zbin-files -llibgphoto2 -llibgphoto2_port -ldllib +$(BASEPATH)\gphoto2.exe: $(OBJS) + @$(LINK) $** -o $@ $(EXELINKFLAGS) $(LIBS) diff --git a/frontends/libgphoto2_frontend/makefile.os2 b/frontends/libgphoto2_frontend/makefile.os2 index b83998e58..105269d7a 100644 --- a/frontends/libgphoto2_frontend/makefile.os2 +++ b/frontends/libgphoto2_frontend/makefile.os2 @@ -1,22 +1,12 @@ -CCFLAGS=-O2 -c -I.. -I..\..\libgphoto2_port\include -I..\..\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc +BASEPATH=..\.. all: start \ lib \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\OS2MAK.INC -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +lib: $(OBJPATH)\script.o -lib: ..\..\obj\script.o - -..\..\obj\script.o: script.c +$(OBJPATH)\script.o: script.c @$(CC) -o $@ $** $(CCFLAGS) diff --git a/libgphoto2/filesys.c b/libgphoto2/filesys.c index e9e55316f..779578b06 100644 --- a/libgphoto2/filesys.c +++ b/libgphoto2/filesys.c @@ -43,61 +43,61 @@ int gp_filesystem_free(CameraFilesystem *fs) { int gp_filesystem_append (CameraFilesystem *fs, char *folder, char *filename) { - int x, y, folder_num=-1, file_num; + int x, y, folder_num=-1, file_num; - for (x=0; x<fs->count; x++) { + for (x=0; x<fs->count; x++) { if (strcmp(fs->folder[x]->name, folder) == 0) { - folder_num = x; + folder_num = x; /* If file exists, return error */ for (y=0; y<fs->folder[x]->count; y++) - if (strcmp(fs->folder[x]->file[y]->name, filename)==0) - return (GP_ERROR_FILE_EXISTS); + if (strcmp(fs->folder[x]->file[y]->name, filename)==0) + return (GP_ERROR_FILE_EXISTS); } - } - - if (folder_num >= 0) { - /* Allocate a new file in that folder */ - fs->folder[folder_num]->file = (CameraFilesystemFile**)realloc( - fs->folder[folder_num]->file, - sizeof(CameraFilesystemFile*)*(fs->folder[folder_num]->count+1)); - if (!fs->folder[folder_num]->file) - return (GP_ERROR_NO_MEMORY); - file_num = fs->folder[folder_num]->count; - } else { + } + + if (folder_num >= 0) { + /* Allocate a new file in that folder */ + fs->folder[folder_num]->file = (CameraFilesystemFile**)realloc( + fs->folder[folder_num]->file, + sizeof(CameraFilesystemFile*)*(fs->folder[folder_num]->count+1)); + if (!fs->folder[folder_num]->file) + return (GP_ERROR_NO_MEMORY); + file_num = fs->folder[folder_num]->count; + } else { /* Allocate the folder pointer */ fs->folder = (CameraFilesystemFolder**)realloc(fs->folder, - sizeof(CameraFilesystemFolder*)*(fs->count+1)); + sizeof(CameraFilesystemFolder*)*(fs->count+1)); if (!fs->folder) return (GP_ERROR_NO_MEMORY); - /* Allocate the actual folder */ - fs->folder[fs->count] = (CameraFilesystemFolder*)malloc( - sizeof(CameraFilesystemFolder)); + /* Allocate the actual folder */ + fs->folder[fs->count] = (CameraFilesystemFolder*)malloc( + sizeof(CameraFilesystemFolder)); - if (!fs->folder[fs->count]) - return (GP_ERROR_NO_MEMORY); + if (!fs->folder[fs->count]) + return (GP_ERROR_NO_MEMORY); - /* Initialize the folder */ - strcpy(fs->folder[fs->count]->name, folder); - fs->folder[fs->count]->count = 0; + /* Initialize the folder */ + strcpy(fs->folder[fs->count]->name, folder); + fs->folder[fs->count]->count = 0; - folder_num = fs->count; - fs->count += 1; - file_num = 0; + folder_num = fs->count; + fs->count += 1; + file_num = 0; - /* Allocate a file in that folder */ - fs->folder[folder_num]->file = (CameraFilesystemFile**)malloc( - sizeof(CameraFilesystemFile*)); - - if (!fs->folder[folder_num]->file) - return (GP_ERROR_NO_MEMORY); - } + /* Allocate a file in that folder */ + fs->folder[folder_num]->file = (CameraFilesystemFile**)malloc( + sizeof(CameraFilesystemFile*)); - /* Append the file */ - fs->folder[folder_num]->file[file_num] = gp_filesystem_entry_new(filename); - fs->folder[folder_num]->count += 1; + if (!fs->folder[folder_num]->file) + return (GP_ERROR_NO_MEMORY); + } - return (GP_OK); + /* Append the file */ + fs->folder[folder_num]->file[file_num] = gp_filesystem_entry_new(filename); + fs->folder[folder_num]->count += 1; + + return (GP_OK); } int gp_filesystem_populate (CameraFilesystem *fs, char *folder, char *format, int count) { @@ -118,7 +118,7 @@ int gp_filesystem_populate (CameraFilesystem *fs, char *folder, char *format, in if (new_folder == -1) { /* Allocate the folder pointer */ fs->folder = (CameraFilesystemFolder**)realloc(fs->folder, - sizeof(CameraFilesystemFolder*)*(fs->count+count)); + sizeof(CameraFilesystemFolder*)*(fs->count+count)); if (!fs->folder) return (GP_ERROR_NO_MEMORY); new_folder = fs->count; diff --git a/libgphoto2/makefile.os2 b/libgphoto2/makefile.os2 index d4f8582f2..6a40386c0 100644 --- a/libgphoto2/makefile.os2 +++ b/libgphoto2/makefile.os2 @@ -1,79 +1,41 @@ -CCFLAGS=-O2 -c -I.. -I..\include -I..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -CC=gcc -MKLIB=ar r +BASEPATH=.. -.c.obj: - $(CC) $< $(CCFLAGS) +.c.o: + $(CC) -o $@ $< $(CCFLAGS) all: start \ dll\ lib \ end -dll: ..\gphoto2.dll +!include $(BASEPATH)\OS2MAK.INC -start: - @echo **** - @echo Entering : $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +dll: $(BASEPATH)\gphoto2.dll -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +lib: $(BASEPATH)\lib\libgphoto2.a -lib: ..\lib\libgphoto2.a +OBJS=core.o \ + exif.o \ + file.o \ + filesys.o \ + library.o \ + settings.o \ + util.o \ + widget.o \ + lists.o \ + camera.o \ + frontend.o \ + port.o -..\obj\core.o: core.c - @$(CC) -o $@ $** $(CCFLAGS) -..\obj\exif.o: exif.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\file.o: file.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\filesys.o: filesys.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\port.o: port.c - @$(CC) -o $@ $** $(CCFLAGS) - -#.\obj\fs.o: fs.c -# @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\library.o: library.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\lists.o: lists.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\settings.o: settings.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\util.o: util.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\widget.o: widget.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\camera.o: camera.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\obj\frontend.o: frontend.c - @$(CC) -o $@ $** $(CCFLAGS) - -..\lib\libgphoto2.a: ..\obj\core.o ..\obj\exif.o ..\obj\file.o ..\obj\filesys.o ..\obj\library.o ..\obj\settings.o ..\obj\util.o ..\obj\widget.o ..\obj\lists.o ..\obj\camera.o ..\obj\frontend.o ..\obj\port.o -#..\obj\fs.o - @implib gphoto2.lib ..\gphoto2.dll +$(BASEPATH)\lib\libgphoto2.a: $(OBJS) + @implib gphoto2.lib $(BASEPATH)\gphoto2.dll @emximp -o $@ gphoto2.lib -gphoto2.def: ..\obj\core.o ..\obj\exif.o ..\obj\file.o ..\obj\filesys.o ..\obj\library.o ..\obj\settings.o ..\obj\util.o ..\obj\widget.o ..\obj\lists.o ..\obj\camera.o ..\obj\frontend.o ..\obj\port.o - @copy gphoto2.df gphoto2.def - @emxexp $** >> gphoto2.def +gphoto2.def: $(OBJS) + @$(MAKEDEF) -..\gphoto2.dll: gphoto2.def ..\obj\core.o ..\obj\exif.o ..\obj\file.o ..\obj\filesys.o ..\obj\library.o ..\obj\settings.o ..\obj\util.o ..\obj\widget.o ..\obj\lists.o ..\obj\camera.o ..\obj\frontend.o ..\obj\port.o - @$(CC) -Wall -Zmtd -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\lib -ldllib -llibgphoto2_port +$(BASEPATH)\gphoto2.dll: gphoto2.def $(OBJS) + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/libgphoto2_port/makefile.os2 b/libgphoto2_port/makefile.os2 index 765f0bd1c..e8548f204 100644 --- a/libgphoto2_port/makefile.os2 +++ b/libgphoto2_port/makefile.os2 @@ -1,7 +1,4 @@ -CCFLAGS=-O2 -c -I.. -I..\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -Iinclude -CC=gcc -MKLIB=ar r - +BASEPATH=.. all: start \ dll \ @@ -9,18 +6,7 @@ all: start \ serial\ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** - @if not exist obj md obj - -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** - +!include $(BASEPATH)\OS2MAK.INC serial: @cd serial @@ -37,26 +23,23 @@ parallel: # @nmake /nologo -f makefile.os2 # @cd.. -lib: ..\lib\libgphoto2_port.a - -dll: ..\lgp2port.dll +lib: $(BASEPATH)\lib\libgphoto2_port.a -obj\portability.o: libgphoto2_port\portability.c - @$(CC) -o $@ $** $(CCFLAGS) +dll: $(BASEPATH)\lgp2port.dll -obj\gp_port.o: libgphoto2_port\gp_port.c - @$(CC) -o $@ $** $(CCFLAGS) -DGP_PORT_SUPPORTED_SERIAL +OBJS=gp_port.o \ + portability.o \ + library.o -obj\library.o: libgphoto2_port\library.c - @$(CC) -o $@ $** $(CCFLAGS) +{libgphoto2_port}.c.o: + @$(CC) -o $(@B).o $< $(CCFLAGS) -DGP_PORT_SUPPORTED_SERIAL -..\lib\libgphoto2_port.a: ..\lgp2port.dll - @implib lgp2port.lib ..\lgp2port.dll +$(BASEPATH)\lib\libgphoto2_port.a: $(BASEPATH)\lgp2port.dll + @implib lgp2port.lib $(BASEPATH)\lgp2port.dll @emximp -o $@ lgp2port.lib -lgp2port.def: obj\gp_port.o obj\portability.o obj\library.o - @copy lgp2port.df lgp2port.def - @emxexp $** >> lgp2port.def +lgp2port.def: $(OBJS) + @$(MAKEDEF) -..\lgp2port.dll: lgp2port.def obj\gp_port.o obj\portability.o obj\library.o - @$(CC) -Zmtd -Wall -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\..\lib -ldllib +$(BASEPATH)\lgp2port.dll: $(OBJS) lgp2port.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/libgphoto2_port/serial/makefile.os2 b/libgphoto2_port/serial/makefile.os2 index d02d8a252..41f3ce8dc 100644 --- a/libgphoto2_port/serial/makefile.os2 +++ b/libgphoto2_port/serial/makefile.os2 @@ -1,36 +1,27 @@ -CCFLAGS=-O2 -c -I.. -I..\..\include -I..\..\libgphoto2_port\include -Zmtd -Zcrtdll -Zbin-files -D__ST_MT_ERRNO_ -I. -DOS2 -DHAVE_TERMIOS_H -DEBUG -CC=gcc +BASEPATH=..\.. all: start \ dll \ lib \ end -start: - @echo **** - @echo Entering: $(MAKEDIR) - @echo using CCFLAGS: $(CCFLAGS) - @echo **** +!include $(BASEPATH)\OS2MAK.INC -end: - @echo **** - @echo Done: $(MAKEDIR) - @echo **** +dll: $(IOLIBS)\giserial.dll -dll: ..\giserial.dll +OBJS=unix.o -..\obj\serial.o : unix.c - @$(CC) -o $@ $** $(CCFLAGS) +.c.o: + @$(CC) -o $@ $< $(CCFLAGS) -lib: ..\..\lib\giserial.a +lib: $(BASEPATH)\lib\giserial.a -..\..\lib\giserial.a: - @implib giserial.lib ..\giserial.dll - @emximp -o ..\..\lib\giserial.a giserial.lib +$(BASEPATH)\lib\giserial.a: + @implib giserial.lib $(IOLIBS)\giserial.dll + @emximp -o $(BASEPATH)\lib\giserial.a giserial.lib -serial.def: ..\obj\serial.o - @copy serial.df serial.def - @emxexp $** >> serial.def +serial.def: unix.o + @$(MAKEDEF) -..\giserial.dll: ..\obj\serial.o serial.def - @$(CC) -Wall -Zmtd -Zdll -Zcrtdll -Zbin-files -o $@ $** -L..\..\lib -ldllib +$(IOLIBS)\giserial.dll: $(OBJS) serial.def + @$(LINK) $(DLLLINKFLAGS) -o $@ $** $(LIBS) diff --git a/libgphoto2_port/serial/unix.c b/libgphoto2_port/serial/unix.c index b488c61eb..7bfa408da 100644 --- a/libgphoto2_port/serial/unix.c +++ b/libgphoto2_port/serial/unix.c @@ -190,8 +190,8 @@ int gp_port_serial_open(gp_port * dev) int fd; fd = open(dev->settings.serial.port, O_RDWR | O_BINARY); dev->device_fd = open(dev->settings.serial.port, O_RDWR | O_BINARY); - - printf("fd %d for %s\n",dev->device_fd,dev->settings.serial.port); + close(fd); + /*printf("fd %d for %s\n",dev->device_fd,dev->settings.serial.port);*/ #else dev->device_fd = open(dev->settings.serial.port, O_RDWR | O_NOCTTY | O_SYNC | O_NONBLOCK); #endif |