aboutsummaryrefslogtreecommitdiff
path: root/src/ptp.h
diff options
context:
space:
mode:
authorLinus Walleij <triad@df.lth.se>2009-08-12 22:56:59 +0000
committerLinus Walleij <triad@df.lth.se>2009-08-12 22:56:59 +0000
commit749282b6caf72127d8f94d9ebf525da65861f37a (patch)
tree855b5b1da4ddaab02005420cec5619016373416c /src/ptp.h
parent882442128d763a05161ae2252383e779c2c929de (diff)
downloadlibmtp-749282b6caf72127d8f94d9ebf525da65861f37a.tar.gz
Fixups for MTP spec 1.0 device detection.
Diffstat (limited to 'src/ptp.h')
-rw-r--r--src/ptp.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ptp.h b/src/ptp.h
index f1bdb88..a96bb18 100644
--- a/src/ptp.h
+++ b/src/ptp.h
@@ -157,6 +157,9 @@ typedef struct _PTPIPHeader PTPIPHeader;
#define PTP_VENDOR_STMICROELECTRONICS 0x00000009
#define PTP_VENDOR_NIKON 0x0000000A
#define PTP_VENDOR_CANON 0x0000000B
+
+/* Vendor extension ID used for MTP */
+#define PTP_VENDOR_MTP 0xffffffff
/* Operation Codes */
@@ -587,6 +590,7 @@ typedef struct _PTPIPHeader PTPIPHeader;
#define PTP_ERROR_RESP_EXPECTED 0x02FD
#define PTP_ERROR_BADPARAM 0x02FC
#define PTP_ERROR_CANCEL 0x02FB
+#define PTP_ERROR_TIMEOUT 0x02FA
/* PTP Event Codes */
@@ -1935,6 +1939,7 @@ struct _PTPParams {
/* PTP: Canon specific flags list */
PTPCanon_Property *canon_props;
int nrofcanon_props;
+ int canon_viewfinder_on;
/* PTP: Canon EOS event queue */
PTPCanon_changes_entry *backlogentries;