* sierra.c, sierra.h: Add and use SIERRA_SKIP_INIT for use with

Polaroid PDC 2300Z.


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6204 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Patrick Mansfield
2003-02-15 20:10:47 +00:00
parent d1a8f6e847
commit a4975dd460
3 changed files with 12 additions and 5 deletions

View File

@@ -1,3 +1,8 @@
2003-02-15 Patrick Mansfield <patmans@users.sourceforge.net>
* sierra.c, sierra.h: Add and use SIERRA_SKIP_INIT for use with
Polaroid PDC 2300Z.
2003-02-15 Patrick Mansfield <patmans@users.sourceforge.net>
* epson-desc.c, library.c, nikon-desc.c olympus-desc.c

View File

@@ -158,7 +158,8 @@ static struct {
SIERRA_WRAP_USB, &oly3040_cam_desc},
{"Panasonic", "Coolshot NV-DCF5E", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
{"Polaroid", "PDC 640", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
{"Polaroid", "PDC 2300Z", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
{"Polaroid", "PDC 2300Z", SIERRA_MODEL_DEFAULT, 0,
SIERRA_SKIP_INIT, 0 },
{"Sanyo", "DSC-X300", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
{"Sanyo", "DSC-X350", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
{"Sanyo", "VPC-G200", SIERRA_MODEL_DEFAULT, 0, 0, 0 },
@@ -2112,11 +2113,11 @@ camera_init (Camera *camera, GPContext *context)
CHECK_FREE (camera, gp_port_set_timeout (camera->port, TIMEOUT));
/*
* Send initialization sequence. Do not do this for the
* 'Polaroid PDC 2300Z' (reported by William Bader
* <williambader@hotmail.com>).
* Send initialization sequence unless otherwise flagged. (The
* 'Polaroid PDC 2300Z' fails sierra_init as reported by William
* Bader <williambader@hotmail.com>).
*/
if (strcmp (a.model, "Polaroid:PDC 2300Z"))
if (!(camera->pl->flags & SIERRA_SKIP_INIT))
CHECK (sierra_init (camera, context));
/* Establish a connection */

View File

@@ -10,6 +10,7 @@ typedef enum {
SIERRA_NO_51 = 1<<1,
SIERRA_LOW_SPEED = 1<<2,
SIERRA_EXT_PROTO = 1<<3,
SIERRA_SKIP_INIT = 1<<4,
} SierraFlags;
struct _CameraPrivateLibrary {