From e01959f23ff9774baaadcd7bb7d814ef7c7144ec Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 1 Oct 2003 13:49:30 +0000 Subject: [PATCH] provide both names "EOS 300D" and "EOS Digital Rebel" for users' convenience git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6800 67ed7778-7388-44ab-90cf-0a291f65f57c --- camlibs/canon/canon.c | 1 + camlibs/ptp2/library.c | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/camlibs/canon/canon.c b/camlibs/canon/canon.c index 4e0a4c118..409922b46 100644 --- a/camlibs/canon/canon.c +++ b/camlibs/canon/canon.c @@ -176,6 +176,7 @@ const struct canonCamModelData models[] = { {"Canon:EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, CAP_SUP, S10M, S32K, S2M, NULL}, /* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */ {"Canon:EOS 300D (normal mode)", CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL}, + {"Canon:EOS Digital Rebel (normal mode)",CANON_EOS_300D,0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL}, {NULL} /* *INDENT-ON* */ diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 3867f1d6d..fab037931 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -299,25 +299,26 @@ static struct { * PTP and "normal" (i.e. Canon) mode * Canon PS G3: A. Marinichev, 20 nov 2002 */ - {"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, + {"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d}, /* 0x306c is S45 in normal (canon) mode */ - {"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, + {"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f}, /* 0x306e is G3 in normal (canon) mode */ - {"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071}, /* 0x3070 is S230 in normal (canon) mode */ - {"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, + {"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071}, /* it's the same as S230 */ - {"Canon:Digital IXUS 2 (PTP mode)", 0x04a9, 0x3072}, + {"Canon:Digital IXUS 2 (PTP mode)", 0x04a9, 0x3072}, - {"Canon:PowerShot A70 (PTP)", 0x04a9, 0x3073}, + {"Canon:PowerShot A70 (PTP)", 0x04a9, 0x3073}, /* A60 and A70 are PTP also */ - {"Canon:PowerShot A60 (PTP)", 0x04a9, 0x3074}, + {"Canon:PowerShot A60 (PTP)", 0x04a9, 0x3074}, /* IXUS 400 has the same PID in both modes, Till Kamppeter */ - {"Canon:Digital IXUS 400 (PTP mode)", 0x4a9, 0x3075}, - {"Canon:PowerShot G5 (PTP mode)", 0x04a9, 0x3085}, + {"Canon:Digital IXUS 400 (PTP mode)", 0x04a9, 0x3075}, + {"Canon:PowerShot G5 (PTP mode)", 0x04a9, 0x3085}, /* 0x3084 is the EOS 300D/Digital Rebel in normal (canon) mode */ - {"Canon:EOS 300D (PTP mode)", 0x04a9, 0x3099}, + {"Canon:EOS 300D (PTP mode)", 0x04a9, 0x3099}, + {"Canon:EOS Digital Rebel (PTP mode)", 0x04a9, 0x3099}, /* more coming soon :) */ {NULL, 0, 0}