#946 unsupported GetDevicePropDesc used

[Thomas Tanner]

gphoto (2.5.1.1) --summary uses PTP_OC_GetDevicePropDesc even though it is not supported on Canon 30D.

6.657895 PTP2/ptp2/library.c(2): Device info:
6.657907 PTP2/ptp2/library.c(2): Manufacturer: Canon Inc.
6.657912 PTP2/ptp2/library.c(2): Model: Canon EOS 30D
6.657917 PTP2/ptp2/library.c(2): device version: 3-1.0.4
6.657922 PTP2/ptp2/library.c(2): serial number: 'xxxxxx'
6.657927 PTP2/ptp2/library.c(2): Vendor extension ID: 0x0000000b
6.657932 PTP2/ptp2/library.c(2): Vendor extension version: 200
6.657937 PTP2/ptp2/library.c(2): Vendor extension description: (null)
6.657942 PTP2/ptp2/library.c(2): Functional Mode: 0x0000
6.657946 PTP2/ptp2/library.c(2): PTP Standard Version: 100
6.657951 PTP2/ptp2/library.c(2): Supported operations:
6.657956 PTP2/ptp2/library.c(2): 0x1015
6.657960 PTP2/ptp2/library.c(2): 0x1001
6.657965 PTP2/ptp2/library.c(2): 0x1002
6.657969 PTP2/ptp2/library.c(2): 0x1003
6.657974 PTP2/ptp2/library.c(2): 0x1004
6.657979 PTP2/ptp2/library.c(2): 0x1005
6.657983 PTP2/ptp2/library.c(2): 0x1006
6.657988 PTP2/ptp2/library.c(2): 0x1007
6.657992 PTP2/ptp2/library.c(2): 0x1008
6.657997 PTP2/ptp2/library.c(2): 0x100a
6.658002 PTP2/ptp2/library.c(2): 0x1009
6.658006 PTP2/ptp2/library.c(2): 0x101b
6.658011 PTP2/ptp2/library.c(2): 0x100c
6.658015 PTP2/ptp2/library.c(2): 0x100d
6.658020 PTP2/ptp2/library.c(2): 0x100b
6.658025 PTP2/ptp2/library.c(2): 0x9101
6.658050 PTP2/ptp2/library.c(2): 0x9102
6.658055 PTP2/ptp2/library.c(2): 0x9103
6.658060 PTP2/ptp2/library.c(2): 0x9104
6.658065 PTP2/ptp2/library.c(2): 0x9107
6.658069 PTP2/ptp2/library.c(2): 0x9105
6.658074 PTP2/ptp2/library.c(2): 0x9117
6.658079 PTP2/ptp2/library.c(2): 0x9118
6.658083 PTP2/ptp2/library.c(2): 0x9116
6.658088 PTP2/ptp2/library.c(2): 0x910f
6.658092 PTP2/ptp2/library.c(2): 0x9115
6.658097 PTP2/ptp2/library.c(2): 0x9110
6.658101 PTP2/ptp2/library.c(2): 0x9114
6.658106 PTP2/ptp2/library.c(2): 0x9113
6.658111 PTP2/ptp2/library.c(2): 0x9106
6.658115 PTP2/ptp2/library.c(2): 0x910a
6.658120 PTP2/ptp2/library.c(2): 0x910b
6.658124 PTP2/ptp2/library.c(2): 0x910c
6.658129 PTP2/ptp2/library.c(2): 0x910d
6.658133 PTP2/ptp2/library.c(2): 0x911a
6.658138 PTP2/ptp2/library.c(2): 0x911b
6.658143 PTP2/ptp2/library.c(2): 0x911c
6.658147 PTP2/ptp2/library.c(2): 0x911d
6.658152 PTP2/ptp2/library.c(2): 0x9108
6.658156 PTP2/ptp2/library.c(2): 0x911f
6.658161 PTP2/ptp2/library.c(2): 0x9109
6.658165 PTP2/ptp2/library.c(2): 0x911e
6.658170 PTP2/ptp2/library.c(2): 0x9120
6.658175 PTP2/ptp2/library.c(2): 0x9121
6.658179 PTP2/ptp2/library.c(2): 0x91fe
6.658184 PTP2/ptp2/library.c(2): 0x91ff
6.658188 PTP2/ptp2/library.c(2): Events Supported:
6.658193 PTP2/ptp2/library.c(2): 0x4009
6.658198 PTP2/ptp2/library.c(2): 0xc101
6.658202 PTP2/ptp2/library.c(2): Device Properties Supported:
6.658207 PTP2/ptp2/library.c(2): 0xd049

this results in:

Camera summary:
Manufacturer: Canon Inc.
Model: Canon EOS 30D
Version: 3-1.0.4
Serial Number: 230103748
Vendor Extension ID: 0xb (2.0)

Capture Formats: JPEG
Display Formats: Script, DPOF, MS AVI, MS Wave, JPEG, CRW, Unknown(bf02), Undefined Type

Device Capabilities:
File Download, File Deletion, File Upload
No Image Capture, No Open Capture, Canon EOS Capture

Storage Devices Summary:

Device Property Summary:
Model ID(0xd049): error 2005 on query.

The following patch fixes the bug:

--- camlibs/ptp2/library.c.old 2013-01-28 09:13:44.000000000 +0100
+++ camlibs/ptp2/library.c 2013-03-26 11:32:31.000000000 +0100
@@ -3936,6 +3936,11 @@
}
}

• if (!ptp_operation_issupported(params, PTP_OC_GetDevicePropDesc)) {
• n = snprintf(txt, spaceleft, "\n");
• if (n>=spaceleft) return GP_OK;spaceleft-=n;txt+=n;
• continue;
• }
  memset (&dpd, 0, sizeof (dpd));
  ret = ptp_getdevicepropdesc (params, dpc, &dpd);
  if (ret == PTP_RC_OK) {

[Marcus Meissner]

applied, thanks!

[Marcus Meissner]

fixed in 2.5.2