Updated nikon d70s with stuff that I implemented this weekend.

Decoded DRM related datablobs on my Creative Zen Micro.


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

2 files changed, 114 insertions, 23 deletions

diff --git a/camlibs/ptp2/cameras/creative-zen-microphoto.txt b/camlibs/ptp2/cameras/creative-zen-microphoto.txt
index bcc2b06ad..f01d05e8d 100644
--- a/camlibs/ptp2/cameras/creative-zen-microphoto.txt
+++ b/camlibs/ptp2/cameras/creative-zen-microphoto.txt
@@ -92,6 +92,97 @@ Device Property Summary:
 Battery Level(0x5001):(read only) (type=0x2) Range [0 - 255, step 1] value: 170
 Property 0xd401:(readwrite) (type=0xffff) (null) ('(null)')
 Property 0xd402:(readwrite) (type=0xffff) (null) ('(null)')
-Property 0xd101:(read only) (type=0x4004) a[98] 60,68,82,77,67,76,79,67,75,32,116,121,112,101,61,34,115,116,97,116,117,115,34,62,60,86,65,76,85,69,62,35,50,48,48,52,48,53,48,49,32,48,57,58,48,48,58,49,50,90,35,60,47,86,65,76,85,69,62,60,70,76,65,71,62,68,82,77,95,67,76,75,95,78,79,84,95,83,69,84,60,47,70,76,65,71,62,60,47,68,82,77,67,76,79,67,75,62
-Property 0xd102:(read only) (type=0x4004) a[2778] 65279,60,68,69,86,67,69,82,84,32,118,101,114,115,105,111,110,61,34,49,46,48,34,62,60,67,69,82,84,73,70,73,67,65,84,69,32,116,121,112,101,61,34,68,69,86,73,67,69,34,62,60,68,65,84,65,62,60,85,78,73,81,85,69,73,68,32,112,114,105,118,97,116,101,61,34,49,34,62,65,81,85,108,85,85,69,68,107,74,117,90,69,119,48,80,81,81,79,81,109,119,65,65,65,65,65,61,60,47,85,78,73,81,85,69,73,68,62,60,80,85,66,76,73,67,75,69,89,32,112,114,105,118,97,116,101,61,34,49,34,62,98,99,53,116,66,107,112,67,49,118,75,104,75,115,112,103,57,120,51,78,116,118,79,81,99,51,101,85,115,49,72,114,51,121,117,85,56,105,78,77,86,87,79,43,101,100,103,54,106,85,71,100,87,81,61,61,60,47,80,85,66,76,73,67,75,69,89,62,60,75,69,89,68,65,84,65,62,119,72,75,69,120,72,113,106,75,90,56,55,89,108,52,89,70,55,120,112,105,74,117,48,90,108,73,61,60,47,75,69,89,68,65,84,65,62,60,47,68,65,84,65,62,60,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,108,121,51,73,67,115,57,81,87,118,51,76,119,111,101,54,114,48,116,71,75,49,55,65,106,51,71,56,122,88,120,43,101,74,76,90,49,77,50,89,73,51,89,55,102,104,84,122,86,114,74,83,79,103,61,61,60,47,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,60,83,89,77,83,73,71,78,65,84,85,82,69,62,52,68,109,86,77,113,77,120,100,84,52,81,77,101,118,67,47,71,112,103,53,50,71,100,53,56,73,61,60,47,83,89,77,83,73,71,78,65,84,85,82,69,62,60,47,67,69,82,84,73,70,73,67,65,84,69,62,60,70,65,76,76,66,65,67,75,62,60,83,69,67,85,82,73,84,89,86,69,82,83,73,79,78,62,50,46,52,46,49,48,50,46,52,51,60,47,83,69,67,85,82,73,84,89,86,69,82,83,73,79,78,62,60,67,69,82,84,73,70,73,67,65,84,69,32,112,114,105,118,97,116,101,61,34,49,34,62,98,99,53,116,66,107,112,67,49,118,75,104,75,115,112,103,57,120,51,78,116,118,79,81,99,51,101,85,115,49,72,114,51,121,117,85,56,105,78,77,86,87,79,43,101,100,103,54,106,85,71,100,87,81,73,69,90,105,115,85,85,107,117,108,73,89,118,85,98,66,72,86,67,109,68,70,57,90,57,107,87,43,82,87,85,102,76,78,43,73,104,54,65,51,104,86,78,115,43,53,107,57,99,53,49,54,66,100,74,71,116,48,60,47,67,69,82,84,73,70,73,67,65,84,69,62,60,47,70,65,76,76,66,65,67,75,62,60,67,69,82,84,73,70,73,67,65,84,69,32,116,121,112,101,61,34,71,82,79,85,80,34,62,60,68,65,84,65,62,60,78,65,77,69,62,67,114,101,97,116,105,118,101,32,90,101,110,32,77,105,99,114,111,80,104,111,116,111,60,47,78,65,77,69,62,13,10,32,32,60,77,65,78,85,70,65,67,84,85,82,69,82,62,67,76,32,68,105,114,101,99,116,32,80,116,101,32,76,116,100,46,60,47,77,65,78,85,70,65,67,84,85,82,69,82,62,13,10,32,32,60,77,79,68,69,76,62,68,65,80,45,77,68,48,48,48,52,60,47,77,79,68,69,76,62,13,10,32,32,60,83,69,67,85,82,73,84,89,76,69,86,69,76,62,50,48,48,48,60,47,83,69,67,85,82,73,84,89,76,69,86,69,76,62,13,10,32,32,60,72,65,82,68,87,65,82,69,95,86,69,82,95,77,65,74,79,82,62,49,60,47,72,65,82,68,87,65,82,69,95,86,69,82,95,77,65,74,79,82,62,13,10,32,32,60,72,65,82,68,87,65,82,69,95,86,69,82,95,77,73,78,79,82,62,48,60,47,72,65,82,68,87,65,82,69,95,86,69,82,95,77,73,78,79,82,62,13,10,32,32,60,70,73,82,77,87,65,82,69,95,86,69,82,95,77,65,74,79,82,62,49,60,47,70,73,82,77,87,65,82,69,95,86,69,82,95,77,65,74,79,82,62,13,10,32,32,60,70,73,82,77,87,65,82,69,95,86,69,82,95,77,73,78,79,82,62,48,60,47,70,73,82,77,87,65,82,69,95,86,69,82,95,77,73,78,79,82,62,13,10,32,32,60,70,69,65,84,85,82,69,83,62,13,10,32,32,32,32,60,67,76,79,67,75,62,50,60,47,67,76,79,67,75,62,13,10,32,32,32,32,60,83,69,67,85,82,69,67,76,79,67,75,62,13,10,32,32,32,32,32,32,60,85,82,76,62,104,116,116,112,58,47,47,103,111,46,109,105,99,114,111,115,111,102,116,46,99,111,109,47,102,119,108,105,110,107,47,63,76,105,110,107,73,100,61,50,53,56,49,55,60,47,85,82,76,62,13,10,32,32,32,32,32,32,60,80,85,66,76,73,67,75,69,89,62,33,67,78,104,118,118,122,49,87,97,78,86,49,65,70,85,109,101,116,120,107,118,109,57,105,68,52,85,114,69,57,99,110,71,85,105,33,113,99,113,100,120,77,105,88,109,68,49,42,105,107,89,71,65,61,61,60,47,80,85,66,76,73,67,75,69,89,62,13,10,32,32,32,32,60,47,83,69,67,85,82,69,67,76,79,67,75,62,13,10,32,32,32,32,60,77,69,84,69,82,73,78,71,62,49,60,47,77,69,84,69,82,73,78,71,62,13,10,32,32,32,32,60,76,73,67,69,78,83,69,95,65,67,81,62,48,60,47,76,73,67,69,78,83,69,95,65,67,81,62,13,10,32,32,32,32,60,76,73,67,69,78,83,69,95,83,89,78,67,62,49,60,47,76,73,67,69,78,83,69,95,83,89,78,67,62,13,10,32,32,32,32,60,69,78,67,82,89,80,84,73,79,78,62,48,60,47,69,78,67,82,89,80,84,73,79,78,62,13,10,32,32,32,32,60,83,89,77,77,69,84,82,73,67,95,79,80,84,62,49,60,47,83,89,77,77,69,84,82,73,67,95,79,80,84,62,13,10,32,32,60,47,70,69,65,84,85,82,69,83,62,13,10,32,32,60,76,73,77,73,84,83,62,13,10,32,32,32,32,60,77,65,88,67,72,65,73,78,68,69,80,84,72,62,50,60,47,77,65,88,67,72,65,73,78,68,69,80,84,72,62,13,10,32,32,32,32,60,77,65,88,76,73,67,69,78,83,69,83,73,90,69,62,49,48,50,52,48,60,47,77,65,88,76,73,67,69,78,83,69,83,73,90,69,62,13,10,32,32,32,32,60,77,65,88,72,69,65,68,69,82,83,73,90,69,62,53,49,50,48,60,47,77,65,88,72,69,65,68,69,82,83,73,90,69,62,13,10,32,32,60,47,76,73,77,73,84,83,62,60,80,85,66,76,73,67,75,69,89,62,85,106,117,114,98,76,104,56,97,112,43,66,56,69,115,88,98,57,70,117,86,104,82,98,87,67,98,75,82,71,68,100,109,55,120,87,84,65,103,75,48,50,101,76,112,84,68,82,85,80,106,85,87,65,61,61,60,47,80,85,66,76,73,67,75,69,89,62,60,47,68,65,84,65,62,60,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,113,117,66,48,117,47,99,84,105,121,98,50,81,110,99,73,54,50,116,47,69,57,56,103,53,120,116,47,89,81,77,81,68,110,76,70,119,88,69,113,119,103,43,116,119,99,90,88,86,77,57,71,74,119,61,61,60,47,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,60,47,67,69,82,84,73,70,73,67,65,84,69,62,60,67,69,82,84,73,70,73,67,65,84,69,32,116,121,112,101,61,34,65,85,84,72,79,82,73,90,65,84,73,79,78,34,62,60,68,65,84,65,62,60,83,69,67,85,82,73,84,89,76,69,86,69,76,62,50,48,48,48,60,47,83,69,67,85,82,73,84,89,76,69,86,69,76,62,60,65,85,84,72,95,73,68,62,51,57,57,60,47,65,85,84,72,95,73,68,62,60,80,85,66,76,73,67,75,69,89,62,71,102,53,79,109,109,104,115,57,48,111,81,51,109,57,56,82,70,57,78,78,76,117,74,51,110,120,103,99,70,103,52,106,48,70,71,114,76,88,115,104,67,73,48,53,117,117,98,78,82,52,54,73,119,61,61,60,47,80,85,66,76,73,67,75,69,89,62,60,47,68,65,84,65,62,60,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,51,75,75,43,49,100,78,79,50,114,57,54,55,85,114,72,57,57,56,86,79,55,99,103,98,49,102,120,47,81,88,117,110,84,51,69,88,79,88,73,103,121,89,72,47,50,47,73,72,116,55,98,76,81,61,61,60,47,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,60,47,67,69,82,84,73,70,73,67,65,84,69,62,60,67,69,82,84,73,70,73,67,65,84,69,32,116,121,112,101,61,34,65,85,84,72,79,82,73,90,65,84,73,79,78,95,82,79,79,84,34,62,60,68,65,84,65,62,60,65,85,84,72,95,73,68,62,49,60,47,65,85,84,72,95,73,68,62,60,80,85,66,76,73,67,75,69,89,62,97,49,116,51,104,120,114,103,33,113,98,79,103,107,116,110,98,89,97,69,69,105,52,116,101,67,115,101,33,103,122,54,82,118,84,80,117,67,33,122,105,122,75,74,108,112,85,55,120,111,100,117,83,119,61,61,60,47,80,85,66,76,73,67,75,69,89,62,60,47,68,65,84,65,62,60,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,75,47,43,85,76,85,69,74,66,74,114,49,76,119,54,99,105,101,113,111,67,114,83,114,51,82,106,122,102,74,103,116,117,56,47,97,116,50,70,114,66,112,86,109,76,84,71,108,47,121,75,79,74,81,61,61,60,47,77,83,68,82,77,95,83,73,71,78,65,84,85,82,69,95,86,65,76,85,69,62,60,47,67,69,82,84,73,70,73,67,65,84,69,62,60,47,68,69,86,67,69,82,84,62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-
+Property 0xd101:(read only) (type=0x4004) <DRMCLOCK type="status"><VALUE>#20040523 08:22:46Z#</VALUE><FLAG>DRM_CLK_NOT_SET</FLAG></DRMCLOCK>
+Property 0xd102:(read only) (type=0x4004) ÿ
+<DEVCERT version="1.0">
+	<CERTIFICATE type="DEVICE">
+		<DATA>
+			<UNIQUEID private="1">
+				AQUlUUEDkJuZEw0PQQOQmwAAAAA=
+				01 05 25 51 41 03 90 9b 99 13 0d 0f 41 03 90 9b 00 00 00 00 
+			</UNIQUEID>
+			<PUBLICKEY private="1">
+				bc5tBkpC1vKhKspg9x3NtvOQc3eUs1Hr3yuU8iNMVWO+edg6jUGdWQ==
+				6d ce 6d 06 4a 42 d6 f2 a1 2a ca 60 f7 1d cd b6 f3 90 73 77 94 b3 51 eb df 2b 94 f2 23 4c 55 63 be 79 d8 3a 8d 41 9d 59 
+			</PUBLICKEY>
+			<KEYDATA>
+				wHKExHqjKZ87Yl4YF7xpiJu0ZlI=
+				c0 72 84 c4 7a a3 29 9f 3b 62 5e 18 17 bc 69 88 9b b4 66 52 
+			</KEYDATA>
+		</DATA>
+		<MSDRM_SIGNATURE_VALUE>
+			ly3ICs9QWv3Lwoe6r0tGK17Aj3G8zXx+eJLZ1M2YI3Y7fhTzVrJSOg==
+			97 2d c8 0a cf 50 5a fd cb c2 87 ba af 4b 46 2b 5e c0 8f 71 bc cd 7c 7e 78 92 d9 d4 cd 98 23 76 3b 7e 14 f3 56 b2 52 3a 
+		</MSDRM_SIGNATURE_VALUE>
+		<SYMSIGNATURE>
+			4DmVMqMxdT4QMevC/Gpg52Gd58I=	
+			e0 39 95 32 a3 31 75 3e 10 31 eb c2 fc 6a 60 e7 61 9d e7 c2 
+		</SYMSIGNATURE>
+	</CERTIFICATE>
+	<FALLBACK>
+		<SECURITYVERSION>2.4.102.43</SECURITYVERSION>
+		<CERTIFICATE private="1">
+			bc5tBkpC1vKhKspg9x3NtvOQc3eUs1Hr3yuU8iNMVWO+edg6jUGdWQIEZisUUkulIYvUbBHVCmDF9Z9kW+RWUfLN+Ih6A3hVNs+5k9c516BdJGt0
+			6d ce 6d 06 4a 42 d6 f2 a1 2a ca 60 f7 1d cd b6 f3 90 73 77 94 b3 51 eb df 2b 94 f2 23 4c 55 63 be 79 d8 3a 8d 41 9d 59 02 04 66 2b 14 52 4b a5 21 8b d4 6c 11 d5 0a 60 c5 f5 9f 64 5b e4 56 51 f2 cd f8 88 7a 03 78 55 36 cf b9 93 d7 39 d7 a0 5d 24 6b 74 
+		</CERTIFICATE>
+	</FALLBACK>
+	<CERTIFICATE type="GROUP">
+		<DATA>
+			<NAME>Creative Zen MicroPhoto</NAME>
+			<MANUFACTURER>CL Direct Pte Ltd.</MANUFACTURER>
+			<MODEL>DAP-MD0004</MODEL>
+			<SECURITYLEVEL>2000</SECURITYLEVEL>
+			<HARDWARE_VER_MAJOR>1</HARDWARE_VER_MAJOR>
+			<HARDWARE_VER_MINOR>0</HARDWARE_VER_MINOR>
+			<FIRMWARE_VER_MAJOR>1</FIRMWARE_VER_MAJOR>
+			<FIRMWARE_VER_MINOR>0</FIRMWARE_VER_MINOR>
+			<FEATURES>
+				<CLOCK>2</CLOCK>
+				<SECURECLOCK>
+					<URL>http://go.microsoft.com/fwlink/?LinkId=25817</URL>
+					<PUBLICKEY>!CNhvvz1WaNV1AFUmetxkvm9iD4UrE9cnGUi!qcqdxMiXmD1*ikYGA==</PUBLICKEY>
+				</SECURECLOCK>
+				<METERING>1</METERING>
+				<LICENSE_ACQ>0</LICENSE_ACQ>
+				<LICENSE_SYNC>1</LICENSE_SYNC>
+				<ENCRYPTION>0</ENCRYPTION>
+				<SYMMETRIC_OPT>1</SYMMETRIC_OPT>
+			</FEATURES>
+			<LIMITS>
+				<MAXCHAINDEPTH>2</MAXCHAINDEPTH>
+				<MAXLICENSESIZE>10240</MAXLICENSESIZE>
+				<MAXHEADERSIZE>5120</MAXHEADERSIZE>
+			</LIMITS>
+			<PUBLICKEY>
+				UjurbLh8ap+B8EsXb9FuVhRbWCbKRGDdm7xWTAgK02eLpTDRUPjUWA==
+				52 3b ab 6c b8 7c 6a 9f 81 f0 4b 17 6f d1 6e 56 14 5b 58 26 ca 44 60 dd 9b bc 56 4c 08 0a d3 67 8b a5 30 d1 50 f8 d4 58 
+			</PUBLICKEY>
+		</DATA>
+		<MSDRM_SIGNATURE_VALUE>
+			quB0u/cTiyb2QncI62t/E98g5xt/YQMQDnLFwXEqwg+twcZXVM9GJw==
+		</MSDRM_SIGNATURE_VALUE>
+	</CERTIFICATE>
+	<CERTIFICATE type="AUTHORIZATION">
+		<DATA>
+			<SECURITYLEVEL>2000</SECURITYLEVEL>
+			<AUTH_ID>399</AUTH_ID>
+			<PUBLICKEY>
+				Gf5Ommhs90oQ3m98RF9NNLuJ3nxgcFg4j0FGrLXshCI05uubNR46Iw==
+			</PUBLICKEY>
+		</DATA>
+		<MSDRM_SIGNATURE_VALUE>
+			3KK+1dNO2r967UrH998VO7cgb1fx/QXunT3EXOXIgyYH/2/IHt7bLQ==
+		</MSDRM_SIGNATURE_VALUE>
+	</CERTIFICATE>
+	<CERTIFICATE type="AUTHORIZATION_ROOT">
+		<DATA>
+			<AUTH_ID>1</AUTH_ID>
+			<PUBLICKEY>
+				a1t3hxrg!qbOgktnbYaEEi4teCse!gz6RvTPuC!zizKJlpU7xoduSw==
+			</PUBLICKEY>
+		</DATA>
+		<MSDRM_SIGNATURE_VALUE>
+			K/+ULUEJBJr1Lw6cieqoCrSr3RjzfJgtu8/at2FrBpVmLTGl/yKOJQ==
+		</MSDRM_SIGNATURE_VALUE>
+	</CERTIFICATE>
+</DEVCERT>
diff --git a/camlibs/ptp2/cameras/nikon-d70s.txt b/camlibs/ptp2/cameras/nikon-d70s.txt
index 6228dd613..b5a48d50e 100644
--- a/camlibs/ptp2/cameras/nikon-d70s.txt
+++ b/camlibs/ptp2/cameras/nikon-d70s.txt
@@ -199,35 +199,35 @@ Exposure Bias Compensation(0x5010):(readwrite) (type=0x3) Enumeration [-5000,-46
 	Still Capture Mode(0x5013):(readwrite) (type=0x4) Enumeration [1,2,32785,32787,32788] value: Single Shot (1)
 	Burst Number(0x5018):(readwrite) (type=0x4) Range [1 - 49, step 1] value: 1
 	Focus Metering Mode(0x501c):(readwrite) (type=0x4) Enumeration [2,32784,32785] value: Single Area (32784)
-Auto White Balance Bias(0xd017):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Tungsten White Balance Bias(0xd018):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Flourescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Daylight White Balance Bias(0xd01a):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Flash White Balance Bias(0xd01b):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Cloudy White Balance Bias(0xd01c):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
-Shady White Balance Bias(0xd01d):(readwrite) (type=0x1) Range [-3 - 4, step 1] value: 0
+	Auto White Balance Bias(0xd017):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Tungsten White Balance Bias(0xd018):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Flourescent White Balance Bias(0xd019):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Daylight White Balance Bias(0xd01a):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Flash White Balance Bias(0xd01b):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Cloudy White Balance Bias(0xd01c):(readwrite) (type=0x1) Range [-3 - 3, step 1] value: 0
+	Shady White Balance Bias(0xd01d):(readwrite) (type=0x1) Range [-3 - 4, step 1] value: 0
 
 Property 0xd01f:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
-Property 0xd025:(read only) (type=0x6) 33685926
-Property 0xd026:(read only) (type=0x6) 33685926
-Sharpening(0xd02a):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 0
-Tone Compensation(0xd02b):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 0
+	Property 0xd025:(read only) (type=0x6) 33685926
+	Property 0xd026:(read only) (type=0x6) 33685926
+	Sharpening(0xd02a):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 0
+	Tone Compensation(0xd02b):(readwrite) (type=0x2) Range [0 - 6, step 1] value: 0
 	Color Mode(0xd02c):(readwrite) (type=0x2) Range [0 - 2, step 1] value: sRGB (0)
-Hue Adjustment(0xd02d):(readwrite) (type=0x1) Range [-9 - 9, step 3] value: 0
+	Hue Adjustment(0xd02d):(readwrite) (type=0x1) Range [-9 - 9, step 3] value: 0
 Property 0xd045:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
 	Focus Area Wrap(0xd04f):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
 	Auto ISO(0xd054):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 Exposure Step(0xd056):(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
 Exposure Compensation(0xd058):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
-Centre Weight Area(0xd059):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 8 mm (1)
+	Centre Weight Area(0xd059):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 8 mm (1)
 	Exposure Lock(0xd05e):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 	Focus Lock(0xd05f):(readwrite) (type=0x2) Range [0 - 5, step 1] value: 0
-Auto Meter Off Time(0xd062):(readwrite) (type=0x2) Range [0 - 4, step 1] value: 1
-Self Timer Delay(0xd063):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 2
-LCD Off Time(0xd064):(readwrite) (type=0x2) Range [0 - 4, step 1] value: 1
+	Auto Meter Off Time(0xd062):(readwrite) (type=0x2) Range [0 - 4, step 1] value: 1
+	Self Timer Delay(0xd063):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 2
+	LCD Off Time(0xd064):(readwrite) (type=0x2) Range [0 - 4, step 1] value: 1
 	Long Exposure Noise Reduction(0xd06b):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 	File Number Sequencing(0xd06c):(readwrite) (type=0x2) Range [0 - 2, step 1] value: Off (0)
-Flash Shutter Speed(0xd075):(readwrite) (type=0x2) Range [0 - 11, step 1] value: 0
+	Flash Shutter Speed(0xd075):(readwrite) (type=0x2) Range [0 - 11, step 1] value: 0
 	Bracket Set(0xd078):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 0
 	Bracket Order(0xd07a):(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
 Reverse Command Dial(0xd086):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
@@ -266,7 +266,7 @@ Property 0xd10b:(readwrite) (type=0x2) Range [0 - 1, step 1] value: 0
 	Property 0xd124:(read only) (type=0x1) Range [-18 - 18, step 1] value: 0
 	Property 0xd125:(read only) (type=0x2) Range [0 - 7, step 1] value: 1
 	Flash Exposure Compensation(0xd126):(readwrite) (type=0x1) Range [-18 - 6, step 2] value: 0.0 stops (0)
-Property 0xd140:(readwrite) (type=0x2) Range [0 - 7, step 1] value: 0
+	Optimize Image:(readwrite) (type=0x2) Range [0 - 7, step 1] value: 0
 Property 0xd142:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
 	AF Beep Mode(0xd160):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (1)
 	Autofocus Mode(0xd161):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
@@ -277,11 +277,11 @@ Auto ISO P/A/DVP Setting(0xd164):(readwrite) (type=0x2) Range [0 - 12, step 1] v
 	Flash Mode(0xd167):(readwrite) (type=0x2) Range [0 - 2, step 1] value: iTTL (0)
 Property 0xd168:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
 	Flash Sign(0xd169):(readwrite) (type=0x2) Range [0 - 1, step 1] value: On (0)
-Remote Timeout(0xd16b):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 1 min (0)
+	Remote Timeout(0xd16b):(readwrite) (type=0x2) Range [0 - 3, step 1] value: 1 min (0)
 	Viewfinder Grid Display(0xd16c):(readwrite) (type=0x2) Range [0 - 1, step 1] value: Off (0)
 	Flash Mode Manual Power(0xd16d):(readwrite) (type=0x2) Range [0 - 4, step 1] value: Full (0)
 Property 0xd16e:(readwrite) (type=0x2) Range [0 - 7, step 1] value: 0
-Property 0xd180:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
+	Property 0xd180:(readwrite) (type=0x2) Range [0 - 2, step 1] value: 0
 Property 0xd190:(readwrite) (type=0x2) Range [0 - 12, step 2] value: 2
 	Low Light(0xd1b0):(read only) (type=0x2) Range [0 - 4, step 1] value: No (0)
 	Flash Open(0xd1c0):(read only) (type=0x2) Range [0 - 1, step 1] value: No (0)