added d40x properties

git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@11699 67ed7778-7388-44ab-90cf-0a291f65f57c

1 files changed, 24 insertions, 0 deletions

diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 4b5939563..2c136d369 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -396,6 +396,28 @@ const static uint16_t nikon_d300_extra_props[] = {
 0xd200, 0xd201
 };
 
+/* From Matthias Eckermanns D40x, extracted by Marcus. */
+const static uint16_t nikon_d40x_extra_props[] = {
+0xd017, 0xd018, 0xd019, 0xd01a, 0xd01b, 0xd01c, 0xd01d, 0xd01f,
+0xd025, 0xd026, 0xd02a, 0xd02b, 0xd02c, 0xd02d,
+0xd045,
+0xd054, 0xd05e, 0xd05f,
+0xd062, 0xd063, 0xd064, 0xd065, 0xd066, 0xd06b, 0xd06c,
+0xd084, 0xd08a,
+0xd090, 0xd091, 0xd092,
+0xd0e0, 0xd0e1, 0xd0e2, 0xd0e3, 0xd0e4, 0xd0e5, 0xd0e6,
+0xd100, 0xd101, 0xd102, 0xd103, 0xd104, 0xd105,
+0xd108, 0xd109, 0xd10b, 0xd10d, 0xd10e,
+0xd120, 0xd121, 0xd122, 0xd124, 0xd125, 0xd126,
+0xd140, 0xd142,
+0xd160, 0xd161, 0xd163, 0xd164, 0xd165, 0xd167,
+0xd16a, 0xd16b, 0xd16d,
+0xd183,
+0xd1b0, 0xd1b1, 0xd1b2,
+0xd1c0, 0xd1c1,
+0xd1e0, 0xd1e1
+};
+
 static const struct {
 	uint16_t	productid;
 	const uint16_t	*extraprops;
@@ -411,6 +433,8 @@ static const struct {
 	{ 0x421, nikon_d90_extra_props, sizeof(nikon_d90_extra_props)/sizeof(nikon_d90_extra_props[0]) },
 	/* D200 - guessed by Marcus */
 	{ 0x410, nikon_d200_extra_props, sizeof(nikon_d200_extra_props)/sizeof(nikon_d200_extra_props[0]) }
+	/* D40x - confirmed by Marcus */
+	{ 0x418, nikon_d40x_extra_props, sizeof(nikon_d40x_extra_props)/sizeof(nikon_d40x_extra_props[0]) }
 };
 
 void