diff options
| author | Linus Walleij <triad@df.lth.se> | 2013-03-05 09:08:44 +0100 |
|---|---|---|
| committer | Linus Walleij <triad@df.lth.se> | 2013-03-05 09:08:44 +0100 |
| commit | b7c1a672d64d2c59634a4717d2e3b957372fb5c1 (patch) | |
| tree | 2608ab3ad06cd810cfb96545bd654b73eda08cfc /src/ptp.h | |
| parent | 6e1ae3e67c68e4325f7066291d5ee78eb07aaf5c (diff) | |
| download | libmtp-b7c1a672d64d2c59634a4717d2e3b957372fb5c1.tar.gz | |
Synchronize to upstream libgphoto2.
Signed-off-by: Linus Walleij <triad@df.lth.se>
Diffstat (limited to 'src/ptp.h')
| -rw-r--r-- | src/ptp.h | 17 |
1 files changed, 16 insertions, 1 deletions
@@ -675,8 +675,9 @@ typedef struct _PTPIPHeader PTPIPHeader; #define PTP_EC_CANON_ExtendedErrorcode 0xC005 /* ? */ #define PTP_EC_CANON_ObjectInfoChanged 0xC008 #define PTP_EC_CANON_RequestObjectTransfer 0xC009 +#define PTP_EC_CANON_ShutterButtonPressed0 0xC00B #define PTP_EC_CANON_CameraModeChanged 0xC00C -#define PTP_EC_CANON_ShutterButtonPressed 0xC00E +#define PTP_EC_CANON_ShutterButtonPressed1 0xC00E #define PTP_EC_CANON_StartDirectTransfer 0xC011 #define PTP_EC_CANON_StopDirectTransfer 0xC013 @@ -1503,6 +1504,8 @@ typedef struct _PTPCanonEOSDeviceInfo { #define PTP_DPC_NIKON_JPEG_Compression_Policy 0xD031 #define PTP_DPC_NIKON_ColorSpace 0xD032 #define PTP_DPC_NIKON_AutoDXCrop 0xD033 +#define PTP_DPC_NIKON_FlickerReduction 0xD034 +#define PTP_DPC_NIKON_RemoteMode 0xD035 #define PTP_DPC_NIKON_VideoMode 0xD036 #define PTP_DPC_NIKON_EffectMode 0xD037 #define PTP_DPC_NIKON_CSMMenuBankSelect 0xD040 @@ -1586,6 +1589,9 @@ typedef struct _PTPCanonEOSDeviceInfo { #define PTP_DPC_NIKON_MovScreenSize 0xD0A0 #define PTP_DPC_NIKON_MovVoice 0xD0A1 #define PTP_DPC_NIKON_MovMicrophone 0xD0A2 +#define PTP_DPC_NIKON_MovFileSlot 0xD0A3 +#define PTP_DPC_NIKON_ManualMovieSetting 0xD0A6 +#define PTP_DPC_NIKON_MonitorOffDelay 0xD0B3 #define PTP_DPC_NIKON_Bracketing 0xD0C0 #define PTP_DPC_NIKON_AutoExposureBracketStep 0xD0C1 #define PTP_DPC_NIKON_AutoExposureBracketProgram 0xD0C2 @@ -2221,6 +2227,15 @@ uint16_t ptp_generic_no_data (PTPParams* params, uint16_t opcode, unsigned int c uint16_t ptp_opensession (PTPParams *params, uint32_t session); +uint16_t ptp_transaction_new (PTPParams* params, PTPContainer* ptp, + uint16_t flags, unsigned int sendlen, + PTPDataHandler *handler +); +uint16_t ptp_transaction (PTPParams* params, PTPContainer* ptp, + uint16_t flags, unsigned int sendlen, + unsigned char **data, unsigned int *recvlen +); + /** * ptp_closesession: * params: PTPParams* |