[gphoto-cvs] libgphoto2/camlibs/canon ChangeLog,1.79,1.80 canon.c,1.253,1.254 canon.h,1.98,1.99

[Hubert F. <hfi...@us...>]

Update of /cvsroot/gphoto/libgphoto2/camlibs/canon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29530/camlibs/canon

Modified Files:
	ChangeLog canon.c canon.h 
Log Message:
	* canon.[ch]: Added EOS 20D


Index: canon.h
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.h,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- canon.h	13 Sep 2004 20:41:28 -0000	1.98
+++ canon.h	20 Oct 2004 17:50:29 -0000	1.99
@@ -117,6 +117,7 @@
  * @CANON_PS_S400: PowerShot S400, Digital IXUS 400
  * @CANON_PS_SD100: PowerShot SD100, Digital IXUS II
  * @CANON_PS_A400: PowerShot A400
+ * @CANON_EOS_20D: EOS 20D
  *
  * Enumeration of all camera types currently supported.
  *
@@ -161,6 +162,7 @@
 	CANON_MV630I,
 	CANON_MV650I,
 	CANON_EOS_10D,
+	CANON_EOS_20D,
 	CANON_OPT_200,
 	/* In Mac OS Image Capture, but not yet seen in the wild. */
 	CANON_PS_UNK1,
@@ -474,7 +476,9 @@
 #define IS_EOS(cam) ( ((cam)==CANON_EOS_D30) \
                       || ((cam)==CANON_EOS_D60) \
                       || ((cam)==CANON_PS_S230) \
-                      || ((cam)==CANON_PS_S400) )
+                      || ((cam)==CANON_PS_S400) \
+		      || ((cam)==CANON_EOS_20D) \
+		)
 
 /*
  * All functions returning a pointer have malloc'ed the data. The caller must

Index: canon.c
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/canon.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -d -r1.253 -r1.254
--- canon.c	18 Oct 2004 21:45:25 -0000	1.253
+++ canon.c	20 Oct 2004 17:50:27 -0000	1.254
@@ -196,6 +196,7 @@
 	{"Canon:PowerShot S410 (normal mode)",CANON_PS_S410,    0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 	{"Canon:Digital IXUS 430 (normal mode)",CANON_PS_S410,  0x04A9, 0x30ba, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 	{"Canon:PowerShot A95 (normal mode)",CANON_PS_A95,      0x04A9, 0x30bb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
+	{"Canon:EOS 20D (normal mode)",CANON_EOS_20D,           0x04A9, 0x30eb, CAP_SUP, SL_MOVIE_LARGE, SL_THUMB, SL_PICTURE, NULL},
 
 	{NULL}
 	/* *INDENT-ON* */

Index: ChangeLog
===================================================================
RCS file: /cvsroot/gphoto/libgphoto2/camlibs/canon/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- ChangeLog	13 Sep 2004 20:41:27 -0000	1.79
+++ ChangeLog	20 Oct 2004 17:50:26 -0000	1.80
@@ -1,3 +1,7 @@
+2004-10-20  Hubert Figuiere  <hfi...@te...>
+
+	* canon.[ch]: Added EOS 20D
+
 2004-09-11  Marcus Meissner  <ma...@je...>
 
 	* canon.[ch]: Added PowerShot A95 as reported.