fixed function/variable naming in sierra library. mod'd configure.in to reflect renaming

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@939 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Scott Fritzinger
2000-08-21 16:54:46 +00:00
parent 2e93374929
commit 1affe79277
9 changed files with 1016 additions and 295 deletions

751
ChangeLog
View File

@@ -1,3 +1,686 @@
2000-08-20 15:47 scottf
* libgphoto2/library.c: minor formatting changes
2000-08-20 15:44 scottf
* libgphoto2/: core.c, file.c, settings.c: added mallocs for NULL
reallocs
2000-08-20 13:29 jgangemi
* frontends/gtk/configure.in: - now checks for gnome libs > 1.2.4
(needed for libglade to work)
2000-08-20 08:13 philm
* camlibs/canon/: Changelog, canon.c, psa50.c: make use of
gp_config_set/get instead of own file to save settings
2000-08-20 06:44 philm
* camlibs/canon/: Changelog, TODO, canon.c, serial.c: USB now works
thanks to the help of James Tappin and Tuomas Jormola.
2000-08-19 11:53 jgangemi
* frontends/gtk/src/main.c: - gphoto-backend correctly initalized
2000-08-19 11:52 jgangemi
* frontends/gtk/src/Makefile.am: - now we look in the dialogs
directory too!
2000-08-19 11:51 jgangemi
* frontends/gtk/configure.in: - added src/dialogs/Makefile
2000-08-19 11:22 philm
* camlibs/canon/serial.c: fixed another type in serial.c
2000-08-19 11:13 jgangemi
* frontends/gtk/configure.in: - more verbose output if libglade
fails
2000-08-19 10:33 philm
* camlibs/canon/serial.c: fixed a typo in serial.c
2000-08-19 04:34 scottf
* camlibs/fujitsu/fujitsu.c: updated the supported camera list
2000-08-18 20:47 jgangemi
* frontends/gtk/src/main.c: - adding gnome support (by by
Lutz_Müller)
2000-08-18 20:45 jgangemi
* frontends/gtk/src/Makefile.am: - adding gnome support (by
Lutz_Müller)
- now uses gpio-config
2000-08-18 20:44 jgangemi
* frontends/gtk/: acconfig.h, configure.in: - adding gnome
support (by Lutz_Müller)
2000-08-18 17:24 scottf
* configure.in, libgphoto2/core.c, libgphoto2/core.h,
libgphoto2/settings.c: implemented id-based settings system
2000-08-18 12:35 scottf
* frontends/gtk-old/src/util.c: removed debug statement. whoops. :P
2000-08-18 12:33 scottf
* frontends/gtk-old/src/: callbacks.c, interface.c, util.c, util.h:
added option to open image in viewer/editor after download
2000-08-18 11:34 scottf
* camlibs/canon/serial.c: minor update in serial.c for latest
libusb (usb_device members names changed)
2000-08-17 17:08 scottf
* camlibs/directory/directory.def: whoops. overwrote the
directory.def file. fixed
2000-08-17 17:06 scottf
* camlibs/directory/directory.c, camlibs/directory/directory.def,
frontends/command-line/main.c: fixing directory browse lib
2000-08-17 15:48 scottf
* camlibs/directory/directory.c, frontends/gtk-old/src/main.c:
directory browse now uses GPIO_DIR macros for portability.
gphoto2_gtk updated for frontend_register functionality
2000-08-17 15:18 scottf
* camlibs/fujitsu/fujitsu.c, camlibs/fujitsu/library.c,
libgphoto2/file.c: minor edits
2000-08-17 10:54 scottf
* camlibs/directory/Makefile.am, camlibs/directory/directory.c,
frontends/command-line/interface.h, frontends/command-line/main.c,
include/gphoto2-datatypes.h, libgphoto2/core.c: fixed
frontend_register function (name-space conflict)
2000-08-17 10:35 scottf
* camlibs/fujitsu/fujitsu.c, camlibs/fujitsu/library.c,
camlibs/fujitsu/library.h, frontends/command-line/main.c,
include/gphoto2-core.h, include/gphoto2-datatypes.h,
include/gphoto2.h, libgphoto2/core.c, libgphoto2/library.c,
libgphoto2/settings.c: fixing little things
2000-08-17 06:36 philm
* frontends/gtk-old/src/Makefile.am: fixed Makefile.am to use
gpio-config
2000-08-17 04:30 mariusz
* configure.in: Solaris workaround for tr and grep fixed
2000-08-17 03:05 philm
* camlibs/canon/: Changelog, canon.c, psa50.c, serial.c: fixed USB
compilation, but does it work?
2000-08-16 15:12 scottf
* include/gphoto2.h, libgphoto2/core.c, libgphoto2/exif.h,
libgphoto2/library.c, libgphoto2/library.h: fixed minor issues
2000-08-16 07:46 mariusz
* configure.in: fixed problems with Solaris tr (ranges) and grep
(-E option)
2000-08-16 07:40 mariusz
* frontends/command-line/main.c: reverse order for image deleting
in cli
2000-08-15 19:33 jgangemi
* frontends/gtk/src/: gp_util.c, gp_util.h: - added gp_idle
- completed gp_interface_message_long
- create_message_win_long unimplemented
- completed gp_interface_message
- create_message_win unimplemented
2000-08-15 19:28 jgangemi
* frontends/gtk/src/: interface.c, interface.h: - added
create_message_win_long stub
- added create_message_win stub
2000-08-15 13:49 scottf
* libgphoto2/: library.c, library.h: quick define changes
2000-08-15 11:42 philm
* camlibs/canon/: Changelog, TODO, canon.c, psa50.c, psa50.h,
serial.c, serial.h, util.c, util.h: created a working
camera_config_set functions (saves debug level and owner name).
modified heavily the driver to use the camlib_data struct to store
all the variables which were previously global. The driver should
now be able to use more than one Canon camera at a time (not
tested).
2000-08-14 20:35 jgangemi
* frontends/gtk/src/camera_util.h: - finished config_camera_cb
- still need to add gp_message calls and implement
build/retrieve rec
routines
2000-08-14 20:31 jgangemi
* frontends/gtk/src/callbacks.c: - finished config_camera_cb
- still need to add gp_message calls and implement the
build/retrieve
routines
2000-08-14 20:30 jgangemi
* frontends/gtk/src/camera_util.c: - moved gp_gtk_camera* to
gp_util
2000-08-14 20:29 jgangemi
* frontends/gtk/src/: gp_util.c, gp_util.h: - new files :
contains all gp_* routines
- added stubs for some routines so interface compiles
- gp_debug_print now functional
2000-08-14 20:27 jgangemi
* frontends/gtk/src/Makefile.am: - added a few more files to
compile
2000-08-13 21:45 jgangemi
* frontends/gtk/src/interface.c: - added some interface menus,
work on local file listings
2000-08-13 21:44 jgangemi
* frontends/gtk/src/: callbacks.c, callbacks.h: - added some new
callbacks
2000-08-13 21:43 jgangemi
* frontends/gtk/src/globals.h: - global vars here
2000-08-13 21:42 jgangemi
* frontends/gtk/src/: tree_list_util.c, tree_list_util.h: - all
functions involving trees reside here - these mainly deal w/
the directory structures and manipulation of the local and
camera
file system
2000-08-13 21:41 jgangemi
* frontends/gtk/src/: camera_util.c, camera_util.h: - all
interface funcs to the camera will reside here - see the README
file
one level up
2000-08-13 21:39 jgangemi
* frontends/gtk/src/Makefile.am: added files for compiling
2000-08-13 21:39 jgangemi
* frontends/gtk/README: read me - i've got some "standards"
listed here
2000-08-12 13:06 scottf
* camlibs/konica/: konica.c, konica.h, library.c, lowlevel.c,
localization/data_english.c30, localization/data_french.c30: added
patches from Lutz. now supports localization
2000-08-11 04:24 simpson2
* camlibs/makefile.os2, camlibs/barbie/makefile.os2,
camlibs/canon/makefile.os2, camlibs/canon/serial.c,
camlibs/digita/makefile.os2, camlibs/directory/makefile.os2,
camlibs/sonydscf1/Makefile.am, camlibs/sonydscf1/chotplay.c,
camlibs/sonydscf1/makefile.os2, camlibs/sonydscf1/sonydscf1.c,
frontends/command-line/makefile.os2,
frontends/libgphoto2_frontend/makefile.os2, include/gphotoos2.h,
libgphoto2/core.c, libgphoto2/file.c, libgphoto2/fs.c,
libgphoto2/makefile.os2: bvl: Updated OS/2 makefile and made a
start with modifying the sony lib
2000-08-10 17:16 scottf
* camlibs/canon/serial.c: removed reference to gpio/gpio.h in favor
of just gpio.h
2000-08-10 16:36 scottf
* camlibs/fujitsu/: fujitsu.c, fujitsu.h: added generic USB support
to fujitsu library. just put in vendor/product/endpoints for any
camera and it will be supported
2000-08-10 16:19 scottf
* camlibs/fujitsu/fujitsu.c, camlibs/fujitsu/fujitsu.h,
camlibs/fujitsu/library.c, frontends/command-line/main.c,
include/gphoto2-datatypes.h: optimized the fujitsu USB support.
little change in folder-display in the cli
2000-08-10 16:04 scottf
* camlibs/canon/canon.c: quick typecast change
2000-08-10 15:48 scottf
* libgphoto2/fs.c: fixed filesystem deletion bug (yuck)
2000-08-10 14:48 philm
* camlibs/canon/: Changelog, canon.c, psa50.c: changed
camera_summary to report battery status.
2000-08-10 13:43 philm
* camlibs/canon/: Changelog, TODO, canon.c, psa50.c, psa50.h: added
psa50_set_time. added some widget to the config dialog box.
2000-08-09 18:22 philm
* camlibs/canon/: Changelog, Protocol, canon.c, psa50.c: changed
timeout for initialization from 1000 to 900 because with 1000 it
was working on command line but not GUI. started a configure
dialog box. changed gp_file_list to use gp_list_append.
2000-08-09 18:17 scottf
* camlibs/fujitsu/fujitsu.c, camlibs/fujitsu/fujitsu.h,
camlibs/fujitsu/library.c, camlibs/fujitsu/library.h,
camlibs/panasonic/.cvsignore, libgphoto2/fs.c: added USB support to
the fujitsu library
2000-08-09 14:44 philm
* camlibs/canon/canon.c: changed a sprintf to strcpy in canon.c
(avoids a coredumps (?))
2000-08-09 14:14 scottf
* camlibs/fujitsu/: fujitsu.c, fujitsu.h, library.c: adding USB
support to fujitsu. it's failing right now. blech.
2000-08-08 19:35 scottf
* include/gphoto2-datatypes.h: modified cameralistentry
2000-08-08 15:43 scottf
* camlibs/konica/: konica.c, konica.h, library.c, library.h,
lowlevel.c, lowlevel.h: added Lutz's patches for filename-centric
API
2000-08-08 15:33 philm
* camlibs/canon/serial.c: Fixed typo in serial.c
2000-08-08 15:04 scottf
* frontends/command-line/main.c: fixed get-all-pictures bug that
crashed the CLI (for_each_image was being called with NULL folder)
2000-08-08 15:00 scottf
* frontends/gtk-old/src/: callbacks.c, interface.c: updated gtk-old
to new API
2000-08-08 14:59 philm
* camlibs/canon/: TODO, canon.c, psa50.c, psa50.h, serial.c: Upload
preliminary support for testing.
2000-08-08 12:56 philm
* camlibs/canon/: Changelog, TODO: TODO and Changelog files
created.
2000-08-08 12:38 philm
* camlibs/canon/: canon.c, serial.c: Bug for setting attributes
corrected. changed canon_serial_send to speed up for all cameras
but A50 which does not like getting too much data in a row.
2000-08-08 12:10 mariusz
* camlibs/panasonic/dc1580.c: bug related to abilities fixed
2000-08-06 06:01 mariusz
* camlibs/panasonic/: README, dc1000.c, dc1580.c: abilities
accomodated to the new API
2000-08-05 09:57 mariusz
* camlibs/panasonic/: README, dc.h, dc1000.c, dc1580.c: filename
based communication between library and core
2000-08-05 05:35 philm
* camlibs/canon/canon.c: camera_file_delete updated to the filename
API
2000-08-05 04:55 philm
* camlibs/canon/: Makefile.am, README, canon.c, psa50.c, serial.c,
serial.h: Updated library to the filename based API. PowerShot A5
support must be updated to the new API. Deletion of pics does not
yet work. USB is not updated to the changes in libgpio.
2000-08-04 20:29 scottf
* docs/: camlib_devel.sgml, camlib_devel.txt: updated linuxdoc and
plaintext camlib developer docs
2000-08-04 18:09 scottf
* camlibs/barbie/barbie.c, camlibs/digita/digita.c,
camlibs/directory/directory.c, camlibs/fujitsu/fujitsu.c,
docs/camlib_devel.lyx, include/gphoto2-core.h,
include/gphoto2-datatypes.h, include/gphoto2-library.h,
libgphoto2/core.c, libgphoto2/globals.h, libgphoto2/library.c:
changed camera_id and camera_abilities prototypes. this should be
the start of stability for the API
2000-08-04 17:09 jerdfelt
* include/gphoto2-datatypes.h: Clean up type definitions and
prototypes. Some minor formatting changes for consistency
2000-08-04 17:07 jerdfelt
* camlibs/digita/: digita.c, usb.c: Get it to atleast compile again
2000-08-04 17:04 jerdfelt
* camlibs/: canon/.cvsignore, konica/.cvsignore: Update .cvsignore
2000-08-04 17:04 jerdfelt
* camlibs/canon/canon.c: Spaces to TABs
2000-08-04 17:02 jerdfelt
* libgphoto2/.cvsignore: Wildcard .lo
2000-08-04 17:01 jerdfelt
* configure.in: Fix alignment for camera help
2000-08-04 17:01 jerdfelt
* camlibs/sonydscf1/: .cvsignore, Makefile.am: Standard files
2000-08-04 15:32 scottf
* camlibs/barbie/barbie.c, camlibs/canon/canon.c,
camlibs/digita/digita.c, camlibs/directory/directory.c,
camlibs/fujitsu/fujitsu.c, camlibs/fujitsu/library.c,
camlibs/konica/library.c, camlibs/panasonic/dc1000.c,
camlibs/panasonic/dc1580.c, camlibs/sonydscf1/sonydscf1.c,
camlibs/template/template.c, docs/camlib_devel-portmon.eps,
docs/camlib_devel-repeater.eps, docs/camlib_devel-y.eps,
docs/camlib_devel.lyx, docs/camlib_devel.txt,
include/gphoto2-library.h, libgphoto2/library.c: changed prototype
for camera_id to use CameraText (sorry everyone\!)
2000-08-04 14:59 jerdfelt
* libgphoto2/core.c: Standardize formatting a little bit
2000-08-04 14:52 jerdfelt
* include/gphoto2-datatypes.h: Tabs before everything? Call me
anal, but I think this is more readable :)
2000-08-04 11:38 scottf
* frontends/command-line/main.c: fixed thumbnail naming buggy
2000-08-03 17:47 scottf
* camlibs/barbie/barbie.c, camlibs/barbie/barbie.h,
camlibs/barbie/library.c, camlibs/directory/directory.c,
camlibs/fujitsu/fujitsu.c, frontends/command-line/main.c,
frontends/gtk-old/src/callbacks.c, include/gphoto2-core.h,
include/gphoto2-datatypes.h, include/gphoto2-library.h,
libgphoto2/core.c, libgphoto2/fs.c: changed to newer API version.
completely filename based, more atomic to make way for camera
locking
2000-08-03 16:13 scottf
* configure.in, camlibs/NOTES, camlibs/barbie/barbie.c,
camlibs/directory/directory.c, camlibs/fujitsu/fujitsu.c,
camlibs/fujitsu/fujitsu.h, camlibs/sonydscf1/chotplay.c,
camlibs/sonydscf1/sonydscf1.c, frontends/command-line/main.c: moved
to filename-based system. tested (pretty well) and working with
barbie, directory, and fujitsu libraries
2000-08-02 10:38 scottf
* DAEMON, camlibs/barbie/Makefile.am, camlibs/barbie/barbie.c,
camlibs/barbie/barbie.h, camlibs/barbie/library.c,
camlibs/barbie/library.h, camlibs/barbie/makefile.os2,
frontends/command-line/main.c, include/gphoto2-core.h,
include/gphoto2-datatypes.h, include/gphoto2-library.h,
libgphoto2/Makefile.am, libgphoto2/core.c, libgphoto2/fs.c,
libgphoto2/fs.h, libgphoto2/library.c: changing to filename based
system
2000-08-01 15:03 scottf
* camlibs/directory/directory.c, include/gphoto2-core.h,
include/gphoto2-datatypes.h, libgphoto2/widget.c: revised widget
system (a little)
2000-08-01 15:00 scottf
* frontends/gtk-old/src/callbacks.c: fixed configuration bug (radio
buttons). updated to newer widget revision
2000-08-01 12:31 scottf
* camlibs/fujitsu/fujitsu.c: added folder support patch from Veros
Kaplan (thanks Veros\!)
2000-08-01 12:17 scottf
* include/gphoto2-datatypes.h: fixed abilities bug
2000-07-31 19:10 scottf
* camlibs/: canon/psa50.c, canon/serial.c, digita/digita.c,
digita/usb.c: updated for new dynamic libgpio
2000-07-31 14:47 scottf
* camlibs/panasonic/.cvsignore: updated .cvsignore
2000-07-31 14:46 scottf
* camlibs/panasonic/: README, dc1000.c, dc1000.h: added missing
panasonic files
2000-07-31 14:45 scottf
* frontends/command-line/main.c, libgphoto2/Makefile.am,
libgphoto2/core.c: fixed CAMLIBS directory bug
2000-07-31 11:16 scottf
* camlibs/fujitsu/fujitsu.c: fixed camera_init conditional
placemente (noted by Veros Kaplan)
2000-07-31 05:16 simpson2
* camlibs/digita/: digita.c, digita.h, serial.c: bvl: init
structure passed to digita seial init, for serial path and speed
2000-07-30 12:59 scottf
* camlibs/konica/: konica.c, konica.h, library.c: added patch from
lutz to konica
2000-07-30 06:34 simpson2
* docs/build_OS2.txt: bvl: start of information on OS/2 Build
2000-07-30 05:10 simpson2
* AUTHORS, camlibs/makefile.os2, camlibs/barbie/makefile.os2,
camlibs/canon/makefile.os2, camlibs/digita/makefile.os2,
camlibs/directory/makefile.os2, camlibs/fujitsu/makefile.os2,
camlibs/konica/makefile.os2, camlibs/panasonic/makefile.os2,
camlibs/sonydscf1/makefile.os2,
frontends/command-line/makefile.os2: bvl: updated OS/2 makefiles,
there was a stupid machine dependant declaration in them
2000-07-29 13:28 scottf
* AUTHORS: added mariusz to the AUTHORS file
2000-07-29 12:06 scottf
* camlibs/: canon/canon.c, panasonic/Makefile.am, panasonic/dc.c,
panasonic/dc.h, panasonic/dc1580.c, panasonic/dc1580.h: applied
patches from Mariusz(panasonic) and Phillipe (canon)
2000-07-29 04:41 simpson2
* camlibs/barbie/makefile.os2,
frontends/libgphoto2_frontend/makefile.os2: bvl: updated OS/2
support
2000-07-29 04:32 simpson2
* camlibs/.cvsignore: bvl: updated
2000-07-29 04:31 simpson2
* camlibs/konica/: .cvsignore, konica.df, makefile.os2: bvl: added
files needed to build DLL on OS/2
2000-07-29 04:30 simpson2
* camlibs/fujitsu/.cvsignore: [no log message]
2000-07-29 04:29 simpson2
* camlibs/fujitsu/: fujitsu.df, makefile.os2: bvl: Files needed to
build DLL on OS/2
2000-07-29 04:28 simpson2
* camlibs/makefile.os2, camlibs/directory/makefile.os2,
frontends/command-line/makefile.os2, include/gphotoos2.h,
libgphoto2/makefile.os2: bvl: various changes and updates to OS/2
specific files
2000-07-29 04:27 simpson2
* camlibs/sonydscf1/: readme, todo: [no log message]
2000-07-29 04:25 simpson2
* camlibs/sonydscf1/: chotplay.c, chotplay.h, command.c, command.h,
common.h, config.h, dsc_f1.c, getuint.c, getuint.h, makefile.os2,
pmp.h, sonydscf1.c, sonydscf1.df, sonydscf1.h: bvl: Support for the
Sony DSC-F1, modified library from gphoto1 only tested and
compiled on OS/2
2000-07-29 04:20 simpson2
* camlibs/canon/: canon.c, psa50.c, serial.c: bvl: changed include
<gpio/gpio.h> to <gpio.h> as discussed earlier
2000-07-29 04:17 simpson2
* camlibs/: barbie/barbie.df, barbie/makefile.os2, canon/canon.df,
canon/makefile.os2: bvl: added files to build DLL on OS/2
2000-07-29 04:16 simpson2
* camlibs/panasonic/: dc.c, dc1580.c, makefile.os2, panasonic.df:
bvl: dc.c, dc1580.c added db.h include, to make it compile on OS/2
makefile.os2 panansonic.df files needed to build dll on OS/2
2000-07-29 04:14 simpson2
* camlibs/digita/digita.df: bvl: digita.df, module defenition file
to create DLL on OS/2
2000-07-29 04:13 simpson2
* camlibs/digita/makefile.os2: bvl: makefile for OS/2
2000-07-29 04:13 simpson2
* camlibs/digita/: commands.c, digita.c, digita.h, serial.c, usb.c:
bvl: Changed include file from <gpio/gpio.h> to <gpio.h>
2000-07-28 23:09 scottf
* include/gphoto2-datatypes.h: fixed abilities->port macros to
reflect renumbering of CameraPortType
2000-07-28 16:54 scottf
* camlibs/panasonic/dc1580.c: replace gp_message in panasonic lib
with gp_camera_message
2000-07-28 13:20 scottf
* camlibs/canon/canon.c, camlibs/canon/canon.h,
camlibs/canon/psa50.c, camlibs/canon/psa50.h,
camlibs/fujitsu/fujitsu.c, frontends/command-line/main.c,
frontends/gtk-old/src/callbacks.c, include/gphoto2-datatypes.h,
libgphoto2/core.c, libgphoto2/globals.h, libgphoto2/library.c:
added patch from mariusz to fix deleting bug. added canon patch
from phillipe to fix thumbnailing bug and add detection of IXUS
2000-07-27 13:00 scottf
* camlibs/canon/canon.c, camlibs/canon/serial.c,
camlibs/konica/library.c, libgphoto2/library.c: fixed 'not a
library' bug for konica and canon libraries
2000-07-27 12:30 scottf
* camlibs/konica/library.c: added patch from Lutz fixing exit, and
removing unneeded struct
2000-07-27 03:31 scottf
* ChangeLog: updated ChangeLog
2000-07-27 00:38 scottf
* frontends/gtk/configure.in: changed name of gtk from project5 to
@@ -5,8 +688,15 @@
2000-07-27 00:37 scottf
* frontends/gtk/: install-sh, missing, mkinstalldirs: remove intl
directory
* frontends/gtk/: install-sh, missing, mkinstalldirs,
intl/ChangeLog, intl/VERSION, intl/bindtextdom.c,
intl/cat-compat.c, intl/dcgettext.c, intl/dgettext.c,
intl/explodename.c, intl/finddomain.c, intl/gettext.c,
intl/gettext.h, intl/gettextP.h, intl/hash-string.h,
intl/intl-compat.c, intl/l10nflist.c, intl/libgettext.h,
intl/linux-msg.sed, intl/loadinfo.h, intl/loadmsgcat.c,
intl/localealias.c, intl/po2tbl.sed.in, intl/textdomain.c,
intl/xopen-msg.sed: remove intl directory
2000-07-27 00:35 scottf
@@ -80,7 +770,14 @@
* frontends/gtk/: ABOUT-NLS, AUTHORS, COPYING, ChangeLog, INSTALL,
Makefile.am, NEWS, README, acconfig.h, aclocal.m4, config.h.in,
configure, configure.in, install-sh, missing, mkinstalldirs,
stamp-h.in, pixmaps/camera.xpm, pixmaps/close_image.xpm,
stamp-h.in, intl/ChangeLog, intl/VERSION, intl/bindtextdom.c,
intl/cat-compat.c, intl/dcgettext.c, intl/dgettext.c,
intl/explodename.c, intl/finddomain.c, intl/gettext.c,
intl/gettext.h, intl/gettextP.h, intl/hash-string.h,
intl/intl-compat.c, intl/l10nflist.c, intl/libgettext.h,
intl/linux-msg.sed, intl/loadinfo.h, intl/loadmsgcat.c,
intl/localealias.c, intl/po2tbl.sed.in, intl/textdomain.c,
intl/xopen-msg.sed, pixmaps/camera.xpm, pixmaps/close_image.xpm,
pixmaps/configure.xpm, pixmaps/delete_images.xpm, pixmaps/exit.xpm,
pixmaps/fliph.xpm, pixmaps/flipv.xpm, pixmaps/folder.xpm,
pixmaps/get_index.xpm, pixmaps/get_index_empty.xpm,
@@ -973,10 +1670,19 @@
2000-06-26 13:34 scottf
* frontends/libgphoto2_frontend/: Makefile, Makefile.am,
Makefile.in, cache.c, cache.h, cache.lo, cache.o, helpers.c,
helpers.h, helpers.lo, helpers.o, image.c, image.h, image.lo,
image.o, libgphoto2_util.la: renamed libgphoto2_util to
* frontends/: libgphoto2_frontend/Makefile,
libgphoto2_frontend/Makefile.am, libgphoto2_frontend/Makefile.in,
libgphoto2_frontend/cache.c, libgphoto2_frontend/cache.h,
libgphoto2_frontend/cache.lo, libgphoto2_frontend/cache.o,
libgphoto2_frontend/helpers.c, libgphoto2_frontend/helpers.h,
libgphoto2_frontend/helpers.lo, libgphoto2_frontend/helpers.o,
libgphoto2_frontend/image.c, libgphoto2_frontend/image.h,
libgphoto2_frontend/image.lo, libgphoto2_frontend/image.o,
libgphoto2_frontend/libgphoto2_util.la,
libgphoto2_util/Makefile.am, libgphoto2_util/cache.c,
libgphoto2_util/cache.h, libgphoto2_util/helpers.c,
libgphoto2_util/helpers.h, libgphoto2_util/image.c,
libgphoto2_util/image.h: renamed libgphoto2_util to
libgphoto2_frontend
2000-06-23 20:48 scottf
@@ -1032,12 +1738,12 @@
camlibs/fujitsu/Makefile.am, camlibs/fujitsu/fujitsu.c,
camlibs/template/Makefile.am, camlibs/template/template.c,
frontends/command-line/main.c, frontends/command-line/test.c,
include/gphoto2-core.h, include/gphoto2-datatypes.h,
include/gphoto2-library.h, libgphoto2/Makefile.am,
libgphoto2/core.c, libgphoto2/core.h, libgphoto2/library.c,
libgphoto2/library.h, libgphoto2/util.c, libgphoto2/util.h:
*revamped CameraAbilities (no more reset/sleep) *making
command-line functional *adding error-checking *removed
frontends/libgphoto2_util/Makefile.am, include/gphoto2-core.h,
include/gphoto2-datatypes.h, include/gphoto2-library.h,
libgphoto2/Makefile.am, libgphoto2/core.c, libgphoto2/core.h,
libgphoto2/library.c, libgphoto2/library.h, libgphoto2/util.c,
libgphoto2/util.h: *revamped CameraAbilities (no more reset/sleep)
*making command-line functional *adding error-checking *removed
camera_open/close *added camera_debug_set to get more verbose
output *other misc.
@@ -1138,7 +1844,17 @@
2000-06-19 12:20 scottf
* frontends/Makefile.am: finish renaming libgphoto2_util
* frontends/: Makefile.am, libgphoto2_util/Makefile.am,
libgphoto2_util/cache.c, libgphoto2_util/cache.h,
libgphoto2_util/helpers.c, libgphoto2_util/helpers.h,
libgphoto2_util/image.c, libgphoto2_util/image.h: finish renaming
libgphoto2_util
2000-06-19 12:19 scottf
* frontends/libgphoto2-util/: Makefile.am, cache.c, cache.h,
image.c, image.h: renaming libgphoto2-util to libgphoto2_util
(Automake don't like dashes)
2000-06-19 12:06 scottf
@@ -1147,8 +1863,11 @@
2000-06-19 12:01 scottf
* frontends/: Makefile.am, command-line/Makefile.am: added
beginining of gphoto2 utility library for frontends
* frontends/: Makefile.am, command-line/Makefile.am,
libgphoto2-util/Makefile.am, libgphoto2-util/cache.c,
libgphoto2-util/cache.h, libgphoto2-util/image.c,
libgphoto2-util/image.h: added beginining of gphoto2 utility
library for frontends
2000-06-16 14:48 scottf

View File

@@ -2,16 +2,16 @@
#include <string.h>
#include <gphoto2.h>
#include <gpio.h>
#include "fujitsu.h"
#include "sierra.h"
#include "library.h"
#define QUICKSLEEP 5
void fujitsu_dump_packet (Camera *camera, char *packet) {
void sierra_dump_packet (Camera *camera, char *packet) {
int x, length=0;
char buf[4096], msg[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if ((packet[0] == TYPE_COMMAND) ||
(packet[0] == TYPE_DATA) ||
@@ -42,22 +42,22 @@ void fujitsu_dump_packet (Camera *camera, char *packet) {
default:
sprintf(buf, " packet: 0x%02x (UNKNOWN!)", packet[0]);
}
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
return;
}
sprintf(msg, " packet length: %i", length);
fujitsu_debug_print(fd, msg);
sierra_debug_print(fd, msg);
if (length > 256)
length = 256;
strcpy(msg, " packet: ");
for (x=0; x<length; x++)
sprintf(msg, "%s 0x%02x ", msg, (unsigned char)packet[x]);
fujitsu_debug_print(fd, msg);
sierra_debug_print(fd, msg);
}
int fujitsu_valid_type(char b) {
int sierra_valid_type(char b) {
unsigned char byte = (unsigned char)b;
@@ -74,10 +74,10 @@ int fujitsu_valid_type(char b) {
return (GP_ERROR);
}
int fujitsu_valid_packet (Camera *camera, char *packet) {
int sierra_valid_packet (Camera *camera, char *packet) {
int length;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if ((packet[0] == TYPE_COMMAND) ||
(packet[0] == TYPE_DATA) ||
@@ -100,16 +100,16 @@ int fujitsu_valid_packet (Camera *camera, char *packet) {
}
}
fujitsu_debug_print(fd, "VALID_PACKET NOT DONE FOR DATA PACKETS!");
sierra_debug_print(fd, "VALID_PACKET NOT DONE FOR DATA PACKETS!");
return (GP_ERROR);
}
int fujitsu_write_packet (Camera *camera, char *packet) {
int sierra_write_packet (Camera *camera, char *packet) {
int x, ret, r, checksum=0, length;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, " fujitsu_write_packet");
sierra_debug_print(fd, " sierra_write_packet");
// usleep(QUICKSLEEP);
@@ -132,7 +132,7 @@ int fujitsu_write_packet (Camera *camera, char *packet) {
packet[length-1]= (checksum >> 8) & 0xff;
}
fujitsu_dump_packet(camera, packet);
sierra_dump_packet(camera, packet);
/* For USB support */
if (fd->type == GP_PORT_USB) {
@@ -146,16 +146,16 @@ int fujitsu_write_packet (Camera *camera, char *packet) {
if (ret != GPIO_OK) {
if (ret == GPIO_TIMEOUT) {
fujitsu_debug_print(fd, " write timed out. trying again.");
sierra_debug_print(fd, " write timed out. trying again.");
if (r++ > RETRIES) {
fujitsu_debug_print(fd, " write failed (too many retries)");
sierra_debug_print(fd, " write failed (too many retries)");
return (GP_ERROR);
}
} else if (ret == GPIO_ERROR) {
fujitsu_debug_print(fd, " write failed");
sierra_debug_print(fd, " write failed");
return (GP_ERROR);
} else {
fujitsu_debug_print(fd, " write failed (unknown error)");
sierra_debug_print(fd, " write failed (unknown error)");
}
} else {
r=0; /* reset retries */
@@ -166,18 +166,18 @@ int fujitsu_write_packet (Camera *camera, char *packet) {
return (GP_OK);
}
int fujitsu_read_packet (Camera *camera, char *packet) {
int sierra_read_packet (Camera *camera, char *packet) {
int y, r=0, ret, done, length=0;
int blocksize, bytes_read;
char buf[4096], msg[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
read_packet_again:
buf[0] = 0;
packet[0] = 0;
fujitsu_debug_print(fd, " fujitsu_read_packet");
sierra_debug_print(fd, " sierra_read_packet");
// usleep(QUICKSLEEP);
@@ -202,13 +202,13 @@ read_packet_again:
}
bytes_read = gpio_read(fd->dev, packet, blocksize);
if (bytes_read == GPIO_ERROR) {
fujitsu_debug_print(fd, " read error (packet type)");
sierra_debug_print(fd, " read error (packet type)");
return (GP_ERROR);
}
if (fujitsu_valid_type(packet[0])==GP_OK)
if (sierra_valid_type(packet[0])==GP_OK)
done = 1;
if (r>RETRIES) {
fujitsu_debug_print(fd, " read error (too many retries on packet type)");
sierra_debug_print(fd, " read error (too many retries on packet type)");
return (GP_ERROR);
}
@@ -220,7 +220,7 @@ read_packet_again:
if (fd->type == GP_PORT_SERIAL) {
bytes_read = gpio_read(fd->dev, &packet[1], 3);
if (bytes_read == GPIO_ERROR) {
fujitsu_debug_print(fd, " read error (header)");
sierra_debug_print(fd, " read error (header)");
return (GP_ERROR);
}
bytes_read = 4;
@@ -231,27 +231,27 @@ read_packet_again:
length += 6;
} else {
/* It's a single byte response. dump and validate */
fujitsu_dump_packet(camera, packet);
return (fujitsu_valid_packet(camera, packet));
sierra_dump_packet(camera, packet);
return (sierra_valid_packet(camera, packet));
}
for (y=bytes_read; y < length; y+=blocksize) {
ret = gpio_read(fd->dev, &packet[y], blocksize);
if (ret == GPIO_TIMEOUT) {
sprintf(msg, " timeout! (%i)\n", y);
fujitsu_debug_print(fd, msg);
fujitsu_write_nak(camera);
sierra_debug_print(fd, msg);
sierra_write_nak(camera);
goto read_packet_again;
}
if (ret ==GPIO_ERROR) {
fujitsu_debug_print(fd, " read error (data)");
sierra_debug_print(fd, " read error (data)");
return (GP_ERROR);
}
}
}
fujitsu_dump_packet(camera, packet);
sierra_dump_packet(camera, packet);
#ifdef GPIO_USB
if (fd->type == GP_PORT_USB)
gpio_usb_clear_halt(fd->dev);
@@ -260,9 +260,9 @@ read_packet_again:
}
int fujitsu_build_packet (Camera *camera, char type, char subtype, int data_length, char *packet) {
int sierra_build_packet (Camera *camera, char type, char subtype, int data_length, char *packet) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
packet[0] = type;
switch (type) {
@@ -281,7 +281,7 @@ int fujitsu_build_packet (Camera *camera, char type, char subtype, int data_leng
packet[1] = subtype;
break;
default:
fujitsu_debug_print(fd, "unknown packet type");
sierra_debug_print(fd, "unknown packet type");
}
packet[2] = data_length & 0xff;
@@ -290,102 +290,102 @@ int fujitsu_build_packet (Camera *camera, char type, char subtype, int data_leng
return (GP_OK);
}
int fujitsu_read_ack(Camera *camera) {
int sierra_read_ack(Camera *camera) {
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, " fujitsu_read_ack");
sierra_debug_print(fd, " sierra_read_ack");
if (fujitsu_read_packet(camera, buf)==GP_ERROR) {
fujitsu_debug_print(fd, "Could not read ACK");
if (sierra_read_packet(camera, buf)==GP_ERROR) {
sierra_debug_print(fd, "Could not read ACK");
return (GP_ERROR);
}
if (buf[0] == ACK)
return (GP_OK);
fujitsu_debug_print(fd, "Could not read ACK");
sierra_debug_print(fd, "Could not read ACK");
return (GP_ERROR);
}
int fujitsu_write_ack(Camera *camera) {
int sierra_write_ack(Camera *camera) {
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, " fujitsu_write_ack");
sierra_debug_print(fd, " sierra_write_ack");
buf[0] = ACK;
if (fujitsu_write_packet(camera, buf)==GP_OK) {
if (sierra_write_packet(camera, buf)==GP_OK) {
#ifdef GPIO_USB
gpio_usb_clear_halt(fd->dev);
#endif
return (GP_OK);
}
fujitsu_debug_print(fd, "Could not write ACK");
sierra_debug_print(fd, "Could not write ACK");
#ifdef GPIO_USB
gpio_usb_clear_halt(fd->dev);
#endif
return (GP_ERROR);
}
int fujitsu_write_nak(Camera *camera) {
int sierra_write_nak(Camera *camera) {
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, " fujitsu_write_nak");
sierra_debug_print(fd, " sierra_write_nak");
buf[0] = NAK;
if (fujitsu_write_packet(camera, buf)==GP_OK) {
if (sierra_write_packet(camera, buf)==GP_OK) {
#ifdef GPIO_USB
gpio_usb_clear_halt(fd->dev);
#endif
return (GP_OK);
}
fujitsu_debug_print(fd, "Could not write NAK");
sierra_debug_print(fd, "Could not write NAK");
#ifdef GPIO_USB
gpio_usb_clear_halt(fd->dev);
#endif
return (GP_ERROR);
}
int fujitsu_ping(Camera *camera) {
int sierra_ping(Camera *camera) {
int r=0;
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
buf[0] = NUL;
while (r++ < RETRIES) {
fujitsu_debug_print(fd, "pinging the camera");
if (fujitsu_write_packet(camera, buf)==GP_ERROR)
sierra_debug_print(fd, "pinging the camera");
if (sierra_write_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
if (buf[0] == NAK) {
fujitsu_debug_print(fd, "ping succeeded");
sierra_debug_print(fd, "ping succeeded");
return (GP_OK);
}
fujitsu_debug_print(fd, "ping failed");
sierra_debug_print(fd, "ping failed");
}
return (GP_ERROR);
}
int fujitsu_set_speed (Camera *camera, int speed) {
int sierra_set_speed (Camera *camera, int speed) {
gpio_device_settings settings;
char buf[1024];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
sprintf(buf, "Setting speed to %i", speed);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
fd->first_packet = 1;
@@ -422,7 +422,7 @@ int fujitsu_set_speed (Camera *camera, int speed) {
return (GP_ERROR);
}
if (fujitsu_set_int_register(camera, 17, speed)==GP_ERROR)
if (sierra_set_int_register(camera, 17, speed)==GP_ERROR)
return (GP_ERROR);
if (gpio_set_settings(fd->dev, settings)==GPIO_ERROR)
return (GP_ERROR);
@@ -431,20 +431,20 @@ int fujitsu_set_speed (Camera *camera, int speed) {
return (GP_OK);
}
int fujitsu_set_int_register (Camera *camera, int reg, int value) {
int sierra_set_int_register (Camera *camera, int reg, int value) {
int l=0, r=0;
char p[4096];
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
sprintf(buf, "Setting register #%i to %i", reg, value);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
if (value < 0)
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 2, p);
sierra_build_packet(camera, TYPE_COMMAND, 0, 2, p);
else
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 6, p);
sierra_build_packet(camera, TYPE_COMMAND, 0, 6, p);
/* Fill in the data */
p[4] = 0x00;
@@ -457,10 +457,10 @@ int fujitsu_set_int_register (Camera *camera, int reg, int value) {
}
while (r++<RETRIES) {
if (fujitsu_write_packet(camera, p)==GP_ERROR)
if (sierra_write_packet(camera, p)==GP_ERROR)
return (GP_ERROR);
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
if (buf[0] == ACK)
@@ -471,24 +471,24 @@ int fujitsu_set_int_register (Camera *camera, int reg, int value) {
return (GP_ERROR);
}
fujitsu_debug_print(fd, "too many retries");
sierra_debug_print(fd, "too many retries");
fujitsu_set_speed(camera, -1);
sierra_set_speed(camera, -1);
return (GP_ERROR);
}
int fujitsu_get_int_register (Camera *camera, int reg, int *value) {
int sierra_get_int_register (Camera *camera, int reg, int *value) {
int l=0, r=0, write_nak=0;
char packet[4096];
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
sprintf(buf, "Getting register #%i value", reg);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 2, packet);
sierra_build_packet(camera, TYPE_COMMAND, 0, 2, packet);
/* Fill in the data */
packet[4] = 0x01;
@@ -496,21 +496,21 @@ int fujitsu_get_int_register (Camera *camera, int reg, int *value) {
while (r++<RETRIES) {
if (write_nak) {
if (fujitsu_write_nak(camera)==GP_ERROR)
if (sierra_write_nak(camera)==GP_ERROR)
return (GP_ERROR);
} else {
if (fujitsu_write_packet(camera, packet)==GP_ERROR)
if (sierra_write_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
}
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
/* DC1 = invalid register or value */
if (buf[0] == DC1)
return (GP_ERROR);
if (buf[0] == TYPE_DATA_END) {
// fujitsu_write_ack(camera);
// sierra_write_ack(camera);
r =((unsigned char)buf[4]) +
((unsigned char)buf[5] * 256) +
((unsigned char)buf[6] * 65536) +
@@ -522,20 +522,20 @@ int fujitsu_get_int_register (Camera *camera, int reg, int *value) {
}
}
fujitsu_debug_print(fd, "too many retries");
sierra_debug_print(fd, "too many retries");
return (GP_ERROR);
}
int fujitsu_set_string_register (Camera *camera, int reg, char *s, int length) {
int sierra_set_string_register (Camera *camera, int reg, char *s, int length) {
char packet[4096], buf[4096];
char type;
unsigned char c;
int x=0, seq=0, size=0, done, r;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
sprintf(buf, "Setting string in register #%i to \"%s\"", reg, s);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
while (x < length) {
if (x==0) {
@@ -548,7 +548,7 @@ int fujitsu_set_string_register (Camera *camera, int reg, char *s, int length) {
else
type = TYPE_DATA_END;
}
fujitsu_build_packet(camera, type, seq, size, packet);
sierra_build_packet(camera, type, seq, size, packet);
if (type == TYPE_COMMAND) {
packet[4] = 0x03;
@@ -563,10 +563,10 @@ int fujitsu_set_string_register (Camera *camera, int reg, char *s, int length) {
r = 0; done = 0;
while ((r++<RETRIES)&&(!done)) {
if (fujitsu_write_packet(camera, packet)==GP_ERROR)
if (sierra_write_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
c = (unsigned char)buf[0];
@@ -581,32 +581,32 @@ int fujitsu_set_string_register (Camera *camera, int reg, char *s, int length) {
}
if (r > RETRIES) {
fujitsu_debug_print(fd, "too many NAKs from camera");
sierra_debug_print(fd, "too many NAKs from camera");
return (GP_ERROR);
}
}
return (GP_OK);
}
int fujitsu_get_string_register (Camera *camera, int reg, int file_number,
int sierra_get_string_register (Camera *camera, int reg, int file_number,
CameraFile *file, char *s, int *length) {
char packet[4096], buf[2048];
int done, x, packlength, do_percent, l;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
sprintf(buf, "Getting string in register #%i", reg);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
do_percent = 1;
if (fujitsu_set_int_register(camera, 4, file_number)==GP_ERROR) {
if (sierra_set_int_register(camera, 4, file_number)==GP_ERROR) {
gp_camera_message(camera, "Can not set current image");
return (GP_ERROR);
}
switch (reg) {
case 14:
/* Get the size of the current image */
if (fujitsu_get_int_register(camera, 12, &l)==GP_ERROR) {
if (sierra_get_int_register(camera, 12, &l)==GP_ERROR) {
gp_camera_message(camera, "Can not get current image length");
return (GP_ERROR);
}
@@ -614,7 +614,7 @@ int fujitsu_get_string_register (Camera *camera, int reg, int file_number,
break;
case 15:
/* Get the size of the current thumbnail */
if (fujitsu_get_int_register(camera, 13, &l)==GP_ERROR) {
if (sierra_get_int_register(camera, 13, &l)==GP_ERROR) {
gp_camera_message(camera, "Can not get thumbnail image length");
return (GP_ERROR);
}
@@ -625,25 +625,25 @@ int fujitsu_get_string_register (Camera *camera, int reg, int file_number,
default:
do_percent = 0;
}
if (fujitsu_set_int_register(camera, 4, file_number)==GP_ERROR) {
if (sierra_set_int_register(camera, 4, file_number)==GP_ERROR) {
gp_camera_message(camera, "Can not set current image");
return (GP_ERROR);
}
/* Send request */
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 2, packet);
sierra_build_packet(camera, TYPE_COMMAND, 0, 2, packet);
packet[4] = 0x04;
packet[5] = reg;
if (fujitsu_write_packet(camera, packet)==GP_ERROR)
if (sierra_write_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
/* Read all the data packets */
x=0; done=0;
while (!done) {
if (fujitsu_read_packet(camera, packet)==GP_ERROR)
if (sierra_read_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
if (packet[0] == DC1)
return (GP_ERROR);
if (fujitsu_write_ack(camera)==GP_ERROR)
if (sierra_write_ack(camera)==GP_ERROR)
return (GP_ERROR);
packlength = ((unsigned char)packet[2]) +
((unsigned char)packet[3] * 256);
@@ -677,41 +677,41 @@ int fujitsu_get_string_register (Camera *camera, int reg, int file_number,
return (GP_OK);
}
int fujitsu_delete(Camera *camera, int picture_number) {
int sierra_delete(Camera *camera, int picture_number) {
char packet[4096], buf[4096];
int r, done;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (fujitsu_set_int_register(camera, 4, picture_number)==GP_ERROR) {
fujitsu_debug_print(fd, "Can not set current image");
if (sierra_set_int_register(camera, 4, picture_number)==GP_ERROR) {
sierra_debug_print(fd, "Can not set current image");
return (GP_ERROR);
}
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 3, packet);
sierra_build_packet(camera, TYPE_COMMAND, 0, 3, packet);
packet[4] = 0x02;
packet[5] = 0x07;
packet[6] = 0x00;
r=0; done=0;
while ((!done)&&(r++<RETRIES)) {
if (fujitsu_write_packet(camera, packet)==GP_ERROR)
if (sierra_write_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
done = (buf[0] == NAK)? 0 : 1;
if (done) {
/* read in the ENQ */
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return ((buf[0]==ENQ)? GP_OK : GP_ERROR);
}
}
if (r > RETRIES) {
fujitsu_debug_print(fd, "too many NAKs from camera");
sierra_debug_print(fd, "too many NAKs from camera");
return (GP_ERROR);
}
@@ -720,24 +720,24 @@ int fujitsu_delete(Camera *camera, int picture_number) {
return (GP_OK);
}
int fujitsu_end_session(Camera *camera) {
int sierra_end_session(Camera *camera) {
char packet[4096], buf[4096];
unsigned char c;
int r, done;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_build_packet(camera, TYPE_COMMAND, 0, 3, packet);
sierra_build_packet(camera, TYPE_COMMAND, 0, 3, packet);
packet[4] = 0x02;
packet[5] = 0x04;
packet[6] = 0x00;
r=0; done=0;
while ((!done)&&(r++<RETRIES)) {
if (fujitsu_write_packet(camera, packet)==GP_ERROR)
if (sierra_write_packet(camera, packet)==GP_ERROR)
return (GP_ERROR);
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
c = (unsigned char)buf[0];
@@ -748,14 +748,14 @@ int fujitsu_end_session(Camera *camera) {
if (done) {
/* read in the ENQ */
if (fujitsu_read_packet(camera, buf)==GP_ERROR)
if (sierra_read_packet(camera, buf)==GP_ERROR)
return (GP_ERROR);
c = (unsigned char)buf[0];
return ((c==ENQ)? GP_OK : GP_ERROR);
}
}
if (r > RETRIES) {
fujitsu_debug_print(fd, "too many NAKs from camera");
sierra_debug_print(fd, "too many NAKs from camera");
return (GP_ERROR);
}

View File

@@ -18,24 +18,24 @@
#define RETRIES 10
/* Packet functions */
void fujitsu_dump_packet (Camera *camera, char *packet);
int fujitsu_valid_packet (Camera *camera, char *packet);
int fujitsu_write_packet (Camera *camera, char *packet);
int fujitsu_read_packet (Camera *camera, char *packet);
int fujitsu_build_packet (Camera *camera, char type, char subtype, int data_length, char *packet);
void sierra_dump_packet (Camera *camera, char *packet);
int sierra_valid_packet (Camera *camera, char *packet);
int sierra_write_packet (Camera *camera, char *packet);
int sierra_read_packet (Camera *camera, char *packet);
int sierra_build_packet (Camera *camera, char type, char subtype, int data_length, char *packet);
/* Communications functions */
int fujitsu_set_speed (Camera *camera, int speed);
int fujitsu_delete_picture (Camera *camera, int picture_number);
int fujitsu_end_session (Camera *camera);
int fujitsu_write_ack (Camera *camera);
int fujitsu_write_nak (Camera *camera);
int fujitsu_ping (Camera *camera);
int fujitsu_set_int_register (Camera *camera, int reg, int value);
int fujitsu_get_int_register (Camera *camera, int reg, int *value);
int fujitsu_set_string_register (Camera *camera, int reg, char *s, int length);
int fujitsu_get_string_register (Camera *camera, int reg, int file_number,
CameraFile *file, char *s, int *length);
int fujitsu_folder_set(Camera *camera, char *folder);
int fujitsu_file_count (Camera *camera);
int fujitsu_delete(Camera *camera, int picture_number);
int sierra_set_speed (Camera *camera, int speed);
int sierra_delete_picture (Camera *camera, int picture_number);
int sierra_end_session (Camera *camera);
int sierra_write_ack (Camera *camera);
int sierra_write_nak (Camera *camera);
int sierra_ping (Camera *camera);
int sierra_set_int_register (Camera *camera, int reg, int value);
int sierra_get_int_register (Camera *camera, int reg, int *value);
int sierra_set_string_register (Camera *camera, int reg, char *s, int length);
int sierra_get_string_register (Camera *camera, int reg, int file_number,
CameraFile *file, char *s, int *length);
int sierra_folder_set (Camera *camera, char *folder);
int sierra_file_count (Camera *camera);
int sierra_delete (Camera *camera, int picture_number);

View File

@@ -4,17 +4,17 @@
#include <gpio.h>
#include "library.h"
#include "fujitsu.h"
#include "sierra.h"
#define TIMEOUT 2000
int camera_start(Camera *camera);
int camera_stop(Camera *camera);
void fujitsu_debug_print(FujitsuData *fd, char *message) {
void sierra_debug_print(SierraData *fd, char *message) {
if (fd->debug) {
printf("fujitsu: ");
printf("sierra: ");
printf(message);
printf("\n");
}
@@ -22,12 +22,12 @@ void fujitsu_debug_print(FujitsuData *fd, char *message) {
int camera_id (CameraText *id) {
strcpy(id->text, "fujitsu-scottf");
strcpy(id->text, "sierra-scottf");
return (GP_OK);
}
FujitsuCamera fujitsu_cameras[] = {
SierraCamera sierra_cameras[] = {
/* Camera Model vendor id, product id, in endpoint, out endpoint */
{"Agfa ePhoto 307", 0, 0, 0, 0 },
{"Agfa ePhoto 780", 0, 0, 0, 0 },
@@ -104,12 +104,12 @@ int camera_abilities (CameraAbilitiesList *list) {
int x=0;
CameraAbilities *a;
while (strlen(fujitsu_cameras[x].model)>0) {
while (strlen(sierra_cameras[x].model)>0) {
a = gp_abilities_new();
strcpy(a->model, fujitsu_cameras[x].model);
strcpy(a->model, sierra_cameras[x].model);
a->port = GP_PORT_SERIAL;
if ((fujitsu_cameras[x].usb_vendor > 0) &&
(fujitsu_cameras[x].usb_product > 0))
if ((sierra_cameras[x].usb_vendor > 0) &&
(sierra_cameras[x].usb_product > 0))
a->port |= GP_PORT_USB;
a->speed[0] = 9600;
a->speed[1] = 19200;
@@ -122,8 +122,8 @@ int camera_abilities (CameraAbilitiesList *list) {
a->file_delete = 1;
a->file_preview = 1;
a->file_put = 0;
a->usb_vendor = fujitsu_cameras[x].usb_vendor;
a->usb_product = fujitsu_cameras[x].usb_product;
a->usb_vendor = sierra_cameras[x].usb_vendor;
a->usb_product = sierra_cameras[x].usb_product;
gp_abilities_list_append(list, a);
x++;
@@ -139,7 +139,7 @@ int camera_init (Camera *camera, CameraInit *init) {
int vendor, product, inep, outep;
#endif
gpio_device_settings settings;
FujitsuData *fd;
SierraData *fd;
if (!camera)
return (GP_ERROR);
@@ -162,17 +162,17 @@ int camera_init (Camera *camera, CameraInit *init) {
camera->functions->manual = camera_manual;
camera->functions->about = camera_about;
fd = (FujitsuData*)malloc(sizeof(FujitsuData));
fd = (SierraData*)malloc(sizeof(SierraData));
camera->camlib_data = fd;
fd->first_packet = 1;
fd->debug = camera->debug;
fujitsu_debug_print(fd, "Initializing camera");
sierra_debug_print(fd, "Initializing camera");
switch (init->port_settings.type) {
case GP_PORT_SERIAL:
fujitsu_debug_print(fd, "Serial Device");
sierra_debug_print(fd, "Serial Device");
fd->dev = gpio_new(GPIO_DEVICE_SERIAL);
strcpy(settings.serial.port, init->port_settings.path);
settings.serial.speed = 19200;
@@ -183,12 +183,12 @@ int camera_init (Camera *camera, CameraInit *init) {
#ifdef GPIO_USB
case GP_PORT_USB:
/* lookup the USB information */
while (strlen(fujitsu_cameras[x].model)>0) {
if (strcmp(fujitsu_cameras[x].model, init->model)==0) {
vendor = fujitsu_cameras[x].usb_vendor;
product = fujitsu_cameras[x].usb_product;
inep = fujitsu_cameras[x].usb_inep;
outep = fujitsu_cameras[x].usb_outep;
while (strlen(sierra_cameras[x].model)>0) {
if (strcmp(sierra_cameras[x].model, init->model)==0) {
vendor = sierra_cameras[x].usb_vendor;
product = sierra_cameras[x].usb_product;
inep = sierra_cameras[x].usb_inep;
outep = sierra_cameras[x].usb_outep;
}
x++;
}
@@ -197,7 +197,7 @@ int camera_init (Camera *camera, CameraInit *init) {
if ((vendor == 0) && (product == 0))
return (GP_ERROR);
fujitsu_debug_print(fd, "USB Device");
sierra_debug_print(fd, "USB Device");
fd->dev = gpio_new(GPIO_DEVICE_USB);
if (gpio_usb_find_device(fd->dev, vendor, product) == GPIO_ERROR) {
@@ -214,7 +214,7 @@ int camera_init (Camera *camera, CameraInit *init) {
break;
#endif
default:
fujitsu_debug_print(fd, "Invalid Device");
sierra_debug_print(fd, "Invalid Device");
free (fd);
return (GP_ERROR);
}
@@ -230,12 +230,12 @@ int camera_init (Camera *camera, CameraInit *init) {
switch (init->port_settings.type) {
case GP_PORT_SERIAL:
if (fujitsu_ping(camera)==GP_ERROR) {
if (sierra_ping(camera)==GP_ERROR) {
gp_camera_message(camera, "Can not talk to camera");
return (GP_ERROR);
}
if (fujitsu_set_speed(camera, init->port_settings.speed)==GP_ERROR) {
if (sierra_set_speed(camera, init->port_settings.speed)==GP_ERROR) {
gp_camera_message(camera, "Can not set the serial port speed");
return (GP_ERROR);
}
@@ -250,24 +250,24 @@ int camera_init (Camera *camera, CameraInit *init) {
break;
}
if (fujitsu_get_int_register(camera, 1, &value)==GP_ERROR) {
if (sierra_get_int_register(camera, 1, &value)==GP_ERROR) {
gp_camera_message(camera, "Could not communicate with camera after initialization");
fd->speed = init->port_settings.speed;
return (GP_ERROR);
}
fujitsu_set_int_register(camera, 83, -1);
sierra_set_int_register(camera, 83, -1);
gpio_set_timeout(fd->dev, 50);
if (fujitsu_set_string_register(camera, 84, "\\", 1)==GP_ERROR)
if (sierra_set_string_register(camera, 84, "\\", 1)==GP_ERROR)
fd->folders = 0;
else
fd->folders = 1;
if (fd->folders)
fujitsu_debug_print(fd, "Camera supports folders");
sierra_debug_print(fd, "Camera supports folders");
else
fujitsu_debug_print(fd, "Camera doesn't support folders. Using CameraFilesystem emu.");
sierra_debug_print(fd, "Camera doesn't support folders. Using CameraFilesystem emu.");
fd->fs = gp_filesystem_new();
@@ -279,9 +279,9 @@ int camera_init (Camera *camera, CameraInit *init) {
return (GP_OK);
}
static int fujitsu_change_folder(Camera *camera, const char *folder)
static int sierra_change_folder(Camera *camera, const char *folder)
{
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
int st=0,i = 1;
char target[128];
@@ -299,10 +299,10 @@ static int fujitsu_change_folder(Camera *camera, const char *folder)
strcpy(target, "/");
if (target[0] != '/') {
fujitsu_debug_print(fd, "Change dir called with relative path?");
sierra_debug_print(fd, "Change dir called with relative path?");
i = 0;
} else {
if (fujitsu_set_string_register(camera, 84, "\\", 1)==GP_ERROR)
if (sierra_set_string_register(camera, 84, "\\", 1)==GP_ERROR)
return GP_ERROR;
}
st = i;
@@ -311,7 +311,7 @@ static int fujitsu_change_folder(Camera *camera, const char *folder)
target[i] = '\0';
if (st == i-1)
break;
if (fujitsu_set_string_register(camera, 84, target+st, strlen(target+st))==GP_ERROR)
if (sierra_set_string_register(camera, 84, target+st, strlen(target+st))==GP_ERROR)
return GP_ERROR;
st = i+1;
target[i] = '/';
@@ -324,24 +324,24 @@ static int fujitsu_change_folder(Camera *camera, const char *folder)
int camera_start(Camera *camera) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (fd->type == GP_PORT_SERIAL) {
if (fujitsu_set_speed(camera, fd->speed)==GP_ERROR) {
if (sierra_set_speed(camera, fd->speed)==GP_ERROR) {
gp_camera_message(camera, "Can not set the serial port speed");
return (GP_ERROR);
}
fujitsu_folder_set(camera, fd->folder);
sierra_folder_set(camera, fd->folder);
}
return (GP_OK);
}
int camera_stop(Camera *camera) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (fd->type == GP_PORT_SERIAL) {
if (fujitsu_set_speed(camera, -1)==GP_ERROR) {
if (sierra_set_speed(camera, -1)==GP_ERROR) {
gp_camera_message(camera, "Can not set the serial port speed");
return (GP_ERROR);
}
@@ -352,9 +352,9 @@ int camera_stop(Camera *camera) {
int camera_exit (Camera *camera) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Exiting camera");
sierra_debug_print(fd, "Exiting camera");
free(fd);
@@ -363,7 +363,7 @@ int camera_exit (Camera *camera) {
int camera_file_list(Camera *camera, CameraList *list, char *folder) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
int x=0, error=0, count;
if ((!fd->folders)&&(strcmp("/", folder)!=0))
@@ -373,13 +373,13 @@ int camera_file_list(Camera *camera, CameraList *list, char *folder) {
return (GP_ERROR);
if (fd->folders) {
if (fujitsu_change_folder(camera, folder)) {
if (sierra_change_folder(camera, folder)) {
gp_camera_message(camera, "Can't change folder");
return (GP_ERROR);
}
}
count = fujitsu_file_count(camera);
count = sierra_file_count(camera);
/* Populate the filesystem */
gp_filesystem_populate(fd->fs, folder, "PIC%04i.jpg", count);
@@ -388,13 +388,13 @@ int camera_file_list(Camera *camera, CameraList *list, char *folder) {
#if 0
/* are all filenames *.jpg, or are there *.tif files too? */
/* Set the current picture number */
if (fujitsu_set_int_register(camera, 4, x+1)==GP_ERROR) {
if (sierra_set_int_register(camera, 4, x+1)==GP_ERROR) {
gp_message("Could not set the picture number");
camera_stop(camera);
return (GP_ERROR);
}
/* Get the picture filename */
if (fujitsu_get_string_register(camera, 79, 0, NULL, buf, &length)==GP_ERROR)
if (sierra_get_string_register(camera, 79, 0, NULL, buf, &length)==GP_ERROR)
gp_message("Could not get filename");
camera_stop(camera);
return (GP_ERROR);
@@ -416,11 +416,11 @@ int camera_file_list(Camera *camera, CameraList *list, char *folder) {
int camera_folder_list(Camera *camera, CameraList *list, char *folder) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
int count, i, bsize;
char buf[1024];
fujitsu_debug_print(fd, "Listing folders");
sierra_debug_print(fd, "Listing folders");
if (!fd->folders) /* camera doesn't support folders */
return GP_OK;
@@ -428,21 +428,21 @@ int camera_folder_list(Camera *camera, CameraList *list, char *folder) {
if (camera_start(camera) != GP_OK) /* XXX */
return GP_ERROR;
if ((fujitsu_change_folder(camera, folder) != GP_OK) ||
(fujitsu_get_int_register(camera, 83, &count) != GP_OK)) {
if ((sierra_change_folder(camera, folder) != GP_OK) ||
(sierra_get_int_register(camera, 83, &count) != GP_OK)) {
camera_stop(camera);
return GP_ERROR;
}
if (count)
for (i = 0; i < count; i++) {
if (fujitsu_change_folder(camera, folder) != GP_OK) {
if (sierra_change_folder(camera, folder) != GP_OK) {
break;
}
if (fujitsu_set_int_register(camera, 83, i+1) != GP_OK) {
if (sierra_set_int_register(camera, 83, i+1) != GP_OK) {
break;
}
bsize = 1024;
if (fujitsu_get_string_register(camera, 84, 0, NULL, buf, &bsize) != GP_OK) {
if (sierra_get_string_register(camera, 84, 0, NULL, buf, &bsize) != GP_OK) {
break;
} else {
/* append the folder name on to the folder list */
@@ -454,11 +454,11 @@ int camera_folder_list(Camera *camera, CameraList *list, char *folder) {
return (GP_OK);
}
int fujitsu_folder_set(Camera *camera, char *folder) {
int sierra_folder_set(Camera *camera, char *folder) {
char buf[4096];
char tf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
/* If the camera doesn't support folders and it was passed something
other than "/", return an error! */
@@ -485,7 +485,7 @@ int fujitsu_folder_set(Camera *camera, char *folder) {
It should be done after implementing camera_lock/unlock pair */
if (fd->folders) {
if (fujitsu_change_folder(camera, tf)) {
if (sierra_change_folder(camera, tf)) {
gp_camera_message(camera, "Can't change folder");
return (GP_ERROR);
}
@@ -494,14 +494,14 @@ int fujitsu_folder_set(Camera *camera, char *folder) {
return (GP_OK);
}
int fujitsu_file_count (Camera *camera) {
int sierra_file_count (Camera *camera) {
int value;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Counting files");
sierra_debug_print(fd, "Counting files");
if (fujitsu_get_int_register(camera, 10, &value)==GP_ERROR) {
if (sierra_get_int_register(camera, 10, &value)==GP_ERROR) {
gp_camera_message(camera, "Could not get number of files on camera->");
return (GP_ERROR);
}
@@ -514,7 +514,7 @@ int camera_file_get_generic (Camera *camera, CameraFile *file,
char buf[4096];
int regl, regd, file_number;
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (camera_start(camera)==GP_ERROR)
return (GP_ERROR);
@@ -531,14 +531,14 @@ return (GP_ERROR);
regl = 12;
regd = 14;
}
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
/* Fill in the file structure */
strcpy(file->type, "image/jpg");
strcpy(file->name, filename);
/* Get the picture data */
if (fujitsu_get_string_register(camera, regd, file_number+1, file, NULL, NULL)==GP_ERROR) {
if (sierra_get_string_register(camera, regd, file_number+1, file, NULL, NULL)==GP_ERROR) {
gp_camera_message(camera, "Can not get picture");
return (GP_ERROR);
}
@@ -561,9 +561,9 @@ int camera_file_get_preview (Camera *camera, CameraFile *file, char *folder, cha
int camera_file_put (Camera *camera, CameraFile *file, char *folder) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Putting file on camera");
sierra_debug_print(fd, "Putting file on camera");
return (GP_ERROR);
}
@@ -572,7 +572,7 @@ int camera_file_delete (Camera *camera, char *folder, char *filename) {
int ret, file_number;
char buf[4096];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (camera_start(camera)==GP_ERROR)
return (GP_ERROR);
@@ -580,9 +580,9 @@ return (GP_ERROR);
file_number = gp_filesystem_number(fd->fs, folder, filename);
sprintf(buf, "Deleting photo #%i", file_number+1);
fujitsu_debug_print(fd, buf);
sierra_debug_print(fd, buf);
ret = fujitsu_delete(camera, file_number+1);
ret = sierra_delete(camera, file_number+1);
if (ret == GPIO_OK)
gp_filesystem_delete(fd->fs, folder, filename);
@@ -594,21 +594,21 @@ return (GP_ERROR);
int camera_config_get (Camera *camera, CameraWidget *window) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Building configuration window");
sierra_debug_print(fd, "Building configuration window");
return (GP_ERROR);
}
int camera_config_set (Camera *camera, CameraSetting *setting, int count) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (camera_start(camera)==GP_ERROR)
return (GP_ERROR);
fujitsu_debug_print(fd, "Setting configuration values");
sierra_debug_print(fd, "Setting configuration values");
if (camera_stop(camera)==GP_ERROR)
return (GP_ERROR);
@@ -618,9 +618,9 @@ return (GP_ERROR);
int camera_capture (Camera *camera, CameraFile *file, CameraCaptureInfo *info) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Capturing image");
sierra_debug_print(fd, "Capturing image");
return (GP_ERROR);
}
@@ -630,20 +630,20 @@ int camera_summary (Camera *camera, CameraText *summary) {
char buf[1024*32];
int value;
char t[1024];
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
if (camera_start(camera)==GP_ERROR)
return (GP_ERROR);
fujitsu_debug_print(fd, "Getting camera summary");
sierra_debug_print(fd, "Getting camera summary");
strcpy(buf, "");
/* Get all the string-related info */
if (fujitsu_get_string_register(camera, 22, 0, NULL, t, &value)!=GP_ERROR)
if (sierra_get_string_register(camera, 22, 0, NULL, t, &value)!=GP_ERROR)
sprintf(buf, "%sCamera ID : %s\n", buf, t);
if (fujitsu_get_string_register(camera, 25, 0, NULL, t, &value)!=GP_ERROR)
if (sierra_get_string_register(camera, 25, 0, NULL, t, &value)!=GP_ERROR)
sprintf(buf, "%sSerial Number : %s\n", buf, t);
if (fujitsu_get_int_register(camera, 1, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 1, &value)!=GP_ERROR) {
switch(value) {
case 1: strcpy(t, "Standard");
break;
@@ -656,14 +656,14 @@ return (GP_ERROR);
}
sprintf(buf, "%sResolution : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 3, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 3, &value)!=GP_ERROR) {
if (value == 0)
strcpy(t, "Auto");
else
sprintf(t, "%i microseconds", value);
sprintf(buf, "%sShutter Speed : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 5, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 5, &value)!=GP_ERROR) {
switch(value) {
case 1: strcpy(t, "Low");
break;
@@ -676,7 +676,7 @@ return (GP_ERROR);
}
sprintf(buf, "%sAperture : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 6, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 6, &value)!=GP_ERROR) {
switch(value) {
case 1: strcpy(t, "Color");
break;
@@ -688,7 +688,7 @@ return (GP_ERROR);
sprintf(buf, "%sColor Mode : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 7, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 7, &value)!=GP_ERROR) {
switch(value) {
case 0: strcpy(t, "Auto");
break;
@@ -705,7 +705,7 @@ return (GP_ERROR);
}
sprintf(buf, "%sFlash Mode : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 19, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 19, &value)!=GP_ERROR) {
switch(value) {
case 0: strcpy(t, "Normal");
break;
@@ -722,7 +722,7 @@ return (GP_ERROR);
}
sprintf(buf, "%sBright/Contrast : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 20, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 20, &value)!=GP_ERROR) {
switch(value) {
case 0: strcpy(t, "Auto");
break;
@@ -739,7 +739,7 @@ return (GP_ERROR);
}
sprintf(buf, "%sWhite Balance : %s\n", buf, t);
}
if (fujitsu_get_int_register(camera, 33, &value)!=GP_ERROR) {
if (sierra_get_int_register(camera, 33, &value)!=GP_ERROR) {
switch(value) {
case 1: strcpy(t, "Macro");
break;
@@ -754,21 +754,21 @@ return (GP_ERROR);
}
/* Get all the integer information */
if (fujitsu_get_int_register(camera, 10, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 10, &value)!=GP_ERROR)
sprintf(buf, "%sFrames Taken : %i\n", buf, value);
if (fujitsu_get_int_register(camera, 11, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 11, &value)!=GP_ERROR)
sprintf(buf, "%sFrames Left : %i\n", buf, value);
if (fujitsu_get_int_register(camera, 16, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 16, &value)!=GP_ERROR)
sprintf(buf, "%sBattery Life : %i\n", buf, value);
if (fujitsu_get_int_register(camera, 23, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 23, &value)!=GP_ERROR)
sprintf(buf, "%sAutoOff (host) : %i seconds\n", buf, value);
if (fujitsu_get_int_register(camera, 24, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 24, &value)!=GP_ERROR)
sprintf(buf, "%sAutoOff (field) : %i seconds\n", buf, value);
if (fujitsu_get_int_register(camera, 28, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 28, &value)!=GP_ERROR)
sprintf(buf, "%sMemory Left : %i bytes\n", buf, value);
if (fujitsu_get_int_register(camera, 35, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 35, &value)!=GP_ERROR)
sprintf(buf, "%sLCD Brightness : %i (1-7)\n", buf, value);
if (fujitsu_get_int_register(camera, 38, &value)!=GP_ERROR)
if (sierra_get_int_register(camera, 38, &value)!=GP_ERROR)
sprintf(buf, "%sLCD AutoOff : %i seconds\n", buf, value);
strcpy(summary->text, buf);
@@ -781,9 +781,9 @@ return (GP_ERROR);
int camera_manual (Camera *camera, CameraText *manual) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Getting camera manual");
sierra_debug_print(fd, "Getting camera manual");
strcpy(manual->text, "Manual Not Available");
@@ -792,11 +792,11 @@ int camera_manual (Camera *camera, CameraText *manual) {
int camera_about (Camera *camera, CameraText *about) {
FujitsuData *fd = (FujitsuData*)camera->camlib_data;
SierraData *fd = (SierraData*)camera->camlib_data;
fujitsu_debug_print(fd, "Getting 'about' information");
sierra_debug_print(fd, "Getting 'about' information");
strcpy(about->text, "Fujitsu SPARClite library\nScott Fritzinger <scottf@unr.edu>\nSupport for Fujitsu-based digital cameras\nincluding Olympus, Nikon, Epson, and others.\n\nThanks to Data Engines (www.dataengines.com)\nfor the use of their Olympus C-3030Z for USB\nsupport implementation.");
strcpy(about->text, "sierra SPARClite library\nScott Fritzinger <scottf@unr.edu>\nSupport for sierra-based digital cameras\nincluding Olympus, Nikon, Epson, and others.\n\nThanks to Data Engines (www.dataengines.com)\nfor the use of their Olympus C-3030Z for USB\nsupport implementation.");
return (GP_OK);
}

View File

@@ -7,7 +7,7 @@ typedef struct {
gpio_device* dev;
char folder[128];
CameraFilesystem *fs;
} FujitsuData;
} SierraData;
typedef struct {
char model[64];
@@ -15,6 +15,6 @@ typedef struct {
int usb_product;
int usb_inep;
int usb_outep;
} FujitsuCamera;
} SierraCamera;
void fujitsu_debug_print(FujitsuData *fd, char *message);
void sierra_debug_print(SierraData *fd, char *message);

View File

@@ -67,7 +67,7 @@ AC_SUBST(CFLAGS)
AC_SUBST(LIBS)
dnl Find out which drivers to compile
camlibs='barbie canon directory fujitsu konica panasonic digita sonydscf1'
camlibs='barbie canon directory sierra konica panasonic digita sonydscf1'
AC_SUBST(SUBDIRS_CAMLIBS)
for i in $camlibs; do
d=`echo $i | $TR a-z A-Z`
@@ -80,7 +80,7 @@ AC_ARG_WITH(drivers,
[ 'all' compiles all drivers; ]
[ possible drivers are: ]
[ barbie, canon, digita, directory, ]
[ fujitsu, konica, panasonic, sonydscf1 ],
[ sierra, konica, panasonic, sonydscf1 ],
drivers="$withval", drivers="all")
if test "$drivers" = "all"; then
for i in $camlibs; do
@@ -111,7 +111,7 @@ AC_OUTPUT(\
Makefile \
camlibs/Makefile \
camlibs/barbie/Makefile \
camlibs/fujitsu/Makefile \
camlibs/sierra/Makefile \
camlibs/directory/Makefile \
camlibs/panasonic/Makefile \
camlibs/konica/Makefile \

View File

@@ -66,9 +66,9 @@ int gp_init (int debug)
/* Make sure the directories are created */
#ifdef WIN32
GetWindowsDirectory(buf, 1024);
strcat(buf, "\\gphoto");
(void)_mkdir(buf);
GetWindowsDirectory(buf, 1024);
strcat(buf, "\\gphoto");
(void)_mkdir(buf);
#else
sprintf(buf, "%s/.gphoto", getenv("HOME"));
(void)mkdir(buf, 0700);
@@ -86,10 +86,8 @@ int gp_init (int debug)
/* Load settings */
load_settings();
if (glob_debug) {
printf("core: Camera library dir: %s\n", CAMLIBS);
if (glob_debug)
printf("core: Trying to load libraries:\n");
}
load_cameras();
if (glob_debug) {

View File

@@ -11,17 +11,10 @@
int is_library(char *library_filename) {
int ret = GP_OK;
char buf[1024];
void *lh;
c_id id;
#if defined(OS2) || defined(WIN32)
sprintf(buf, "%s\\%s", CAMLIBS, library_filename);
#else
sprintf(buf, "%s/%s", CAMLIBS, library_filename);
#endif
if ((lh = GPIO_DLOPEN(buf)) == NULL)
if ((lh = GPIO_DLOPEN(library_filename)) == NULL)
return (GP_ERROR);
id = (c_id)GPIO_DLSYM(lh, "camera_id");
if (!id)
@@ -33,13 +26,11 @@ int is_library(char *library_filename) {
int load_library (Camera *camera, char *camera_name) {
char buf[1024];
void *lh;
int x;
for (x=0; x<glob_abilities_list->count; x++) {
if (strcmp(glob_abilities_list->abilities[x]->model, camera_name)==0) {
sprintf(buf, "%s/%s", CAMLIBS, glob_abilities_list->abilities[x]->library);
if ((lh = GPIO_DLOPEN(buf))==NULL) {
if ((lh = GPIO_DLOPEN(glob_abilities_list->abilities[x]->library))==NULL) {
if (glob_debug)
perror("core:\tload_library");
return (GP_ERROR);
@@ -60,21 +51,14 @@ int load_camera_list (char *library_filename) {
/* Returns the number of cameras added to the CameraChoice list */
/* 0 implies an error occurred */
char buf[1024];
CameraText id;
void *lh;
CameraText id;
void *lh;
c_abilities load_camera_abilities;
c_id load_camera_id;
int x, old_count;
#if defined(OS2) || defined(WIN32)
sprintf(buf, "%s\\%s", CAMLIBS, library_filename);
#else
sprintf(buf, "%s/%s", CAMLIBS, library_filename);
#endif
/* try to open the library */
if ((lh = GPIO_DLOPEN(buf))==NULL) {
if ((lh = GPIO_DLOPEN(library_filename))==NULL) {
if (glob_debug)
perror("core:\tload_camera_list");
return 0;
@@ -114,19 +98,21 @@ int load_camera_list (char *library_filename) {
return (x);
}
int load_cameras() {
int load_cameras_search (char *directory) {
GPIO_DIR d;
GPIO_DIRENT de;
CameraAbilities *t;
char buf[1024];
int x, y, z;
if (glob_debug) {
printf("core: Trying to load camera libraries in:\n");
printf("core: \t%s\n", directory);
}
/* Look for available camera libraries */
d = GPIO_OPENDIR(CAMLIBS);
d = GPIO_OPENDIR(directory);
if (!d) {
fprintf(stderr, "core: couldn't open %s\n", CAMLIBS);
fprintf(stderr, "core: couldn't open %s\n", directory);
return GP_ERROR;
}
@@ -134,22 +120,39 @@ int load_cameras() {
/* Read each entry */
de = GPIO_READDIR(d);
if (de) {
sprintf(buf, "%s%c%s", directory, GPIO_DIR_DELIM, GPIO_FILENAME(de));
if (glob_debug)
printf("core:\tis %s a library? ", GPIO_FILENAME(de));
printf("core:\tis %s a library? ", buf);
/* try to open the library */
if (is_library(GPIO_FILENAME(de)) == GP_OK) {
if (is_library(buf) == GP_OK) {
if (glob_debug)
printf("yes\n");
load_camera_list(GPIO_FILENAME(de));
load_camera_list(buf);
} else {
if (glob_debug) {
printf("no\n");
printf("core: reason: %s\n", GPIO_DLERROR());
printf("core: \t reason: %s\n", GPIO_DLERROR());
}
}
}
} while (de);
return (GP_OK);
}
int load_cameras() {
int x, y, z;
CameraAbilities *t;
/* Where should we search for camera libraries? */
/* The installed camera library directory */
load_cameras_search(CAMLIBS);
/* Current directory */
load_cameras_search(".");
/* Sort the camera list */
for (x=0; x<glob_abilities_list->count-1; x++) {
for (y=x+1; y<glob_abilities_list->count; y++) {
@@ -163,12 +166,14 @@ int load_cameras() {
}
}
/* MUCH too verbose.
if (glob_debug) {
printf("core: Loaded camera list:");
// gp_abilities_list_dump(glob_abilities_list);
printf("core: Loaded camera list:\n");
gp_abilities_list_dump(glob_abilities_list);
}
*/
return (GP_OK);
return (GP_OK);
}
int close_library (Camera *camera) {

View File

@@ -57,7 +57,6 @@ int load_settings () {
if (verify_settings(buf) == GP_ERROR)
/* verify_settings will unlink and recreate the settings file */
return (GP_OK);
printf("here\n");
if (glob_debug)
printf("core: Loading settings from file \"%s\"\n", buf);