removed some dups from override list, added some more ptp.h comments

2 files changed, 29 insertions, 21 deletions

diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 57b2b568a..a665c8ed6 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -388,7 +388,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 	}
 
 	if (di->VendorExtensionID == PTP_VENDOR_FUJI) {
-		C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported[0])*(di->DevicePropertiesSupported_len + 53)));
+		C_MEM (di->DevicePropertiesSupported = realloc(di->DevicePropertiesSupported,sizeof(di->DevicePropertiesSupported[0])*(di->DevicePropertiesSupported_len + 48)));
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+0] = PTP_DPC_ExposureTime;
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+1] = PTP_DPC_FNumber;
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+2] = 0xd38c;	/* PC Mode */
@@ -402,7 +402,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+10] = PTP_DPC_FUJI_LiveViewImageQuality; /* xt3 confirmed */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+11] = PTP_DPC_FUJI_ForceMode; /* on xt3 set by webcam app to 1 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+12] = 0xd16e; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+13] = 0xd01c; /* seen on xt3 */
+		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+13] = 0xd372; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+14] = 0xd020; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+15] = 0xd022; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+16] = 0xd023; /* seen on xt3 */
@@ -411,9 +411,9 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+19] = 0xd026; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+20] = 0xd027; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+21] = 0xd029; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+22] = 0xd10a; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+23] = 0xd10b; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+24] = 0xd112; /* seen on xt3 */
+		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+22] = 0xd16f; /* seen on xt3 */
+		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+23] = 0xd02f; /* seen on xt3 */
+		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+24] = 0xd395; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+25] = 0xd320; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+26] = 0xd321; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+27] = 0xd322; /* seen on xt3 */
@@ -427,7 +427,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+35] = 0xd173; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+36] = 0xd365; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+37] = 0xd366; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+38] = 0xd38c; /* seen on xt3 */
+		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+38] = 0xd374; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+39] = 0xd310; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+40] = 0xd359; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+41] = 0xd375; /* seen on xt3 */
@@ -437,12 +437,7 @@ fixup_cached_deviceinfo (Camera *camera, PTPDeviceInfo *di) {
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+45] = 0xd364; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+46] = 0xd34e; /* seen on xt3 */
 		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+47] = 0xd02e; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+48] = 0xd02f; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+49] = 0xd16f; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+50] = 0xd372; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+51] = 0xd374; /* seen on xt3 */
-		di->DevicePropertiesSupported[di->DevicePropertiesSupported_len+52] = 0xd395; /* seen on xt3 */
-		di->DevicePropertiesSupported_len += 53;
+		di->DevicePropertiesSupported_len += 48;
 
 		if (ptp_operation_issupported(&camera->pl->params, PTP_OC_FUJI_GetDeviceInfo)) {
 			uint16_t	*props;
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index 1a19a5e36..3fdc3a534 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -981,13 +981,20 @@ typedef struct _PTPIPHeader PTPIPHeader;
  * 90fe firmware update
  */
 
+/* These opcodes are probably FUJI Wifi only (but not USB) */
+#define PTP_OC_FUJI_InitiateMovieCapture		0x9020
+#define PTP_OC_FUJI_TerminateMovieCapture		0x9021
 #define PTP_OC_FUJI_GetCapturePreview			0x9022
-#define PTP_OC_FUJI_SetFocusPoint			0x9026
-#define PTP_OC_FUJI_ResetFocusPoint			0x9027
+#define PTP_OC_FUJI_SetFocusPoint			0x9026	/* LockS1Lock */
+#define PTP_OC_FUJI_ResetFocusPoint			0x9027	/* UnlockS1Lock */
 #define PTP_OC_FUJI_GetDeviceInfo			0x902B
-#define PTP_OC_FUJI_SetShutterSpeed			0x902C
-#define PTP_OC_FUJI_SetAperture				0x902D
-#define PTP_OC_FUJI_SetExposureCompensation		0x902E
+#define PTP_OC_FUJI_SetShutterSpeed			0x902C	/* StepShutterSpeed */
+#define PTP_OC_FUJI_SetAperture				0x902D	/* StepFNumber */
+#define PTP_OC_FUJI_SetExposureCompensation		0x902E	/* StepExposureBias */
+#define PTP_OC_FUJI_CancelInitiateCapture		0x9030
+#define PTP_OC_FUJI_FmSendObjectInfo			0x9040
+#define PTP_OC_FUJI_FmSendObject			0x9041
+#define PTP_OC_FUJI_FmSendPartialObject			0x9042
 
 /* Proprietary vendor extension operations mask */
 #define PTP_OC_EXTENSION_MASK           0xF000
@@ -2686,6 +2693,8 @@ typedef struct _PTPCanonEOSDeviceInfo {
 #define PTP_DPC_FUJI_CenterButton			0xD133
 #define PTP_DPC_FUJI_MultiSelectorButton		0xD134
 #define PTP_DPC_FUJI_FunctionLock			0xD136
+#define PTP_DPC_FUJI_Password				0xD145
+#define PTP_DPC_FUJI_ChangePassword			0xD146	/* ? */
 #define PTP_DPC_FUJI_ButtonsAndDials			0xD14B
 #define PTP_DPC_FUJI_MBD200Batteries			0xD14E
 #define PTP_DPC_FUJI_AFOnForMBD200Batteries		0xD14F
@@ -2731,10 +2740,14 @@ typedef struct _PTPCanonEOSDeviceInfo {
  * gfx50r: 0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1,0x9300,5,0xe
  * xpro2:  0x104,0x200,0x4,0x304,0x500,0xc,0xa000,6,0x9000,2,0x9100,1
  *
- * 0x304 is for regular capture
- * 0x200 seems for autofocus (s1?)
- * 0x500 start bulb? 0xc end bulb?
- * 0x400 might also be start bulb?
+ * 0x304 is for regular capture 	SDK_ShootS2toS0	(default) (SDK_Shoot)
+ * 0x200 seems for autofocus (s1?)	SDK_ShootS1
+ * 0x500 start bulb? 0xc end bulb?	SDK_StartBulb
+ * 0x400 might also be start bulb?	SDK_StartBulb
+ * 0xc					SDK_EndBulb
+ * 0x600 				SDK_1PushAF
+ * 0x4 					SDK_CancelS1
+ * 0x300 				SDK_ShootS2
  */
 #define PTP_DPC_FUJI_FocusLock				0xD209 /* AF Status */
 #define PTP_DPC_FUJI_DeviceName				0xD20B