diff options
| author | Linus Walleij <triad@df.lth.se> | 2008-12-14 01:07:30 +0000 |
|---|---|---|
| committer | Linus Walleij <triad@df.lth.se> | 2008-12-14 01:07:30 +0000 |
| commit | d1e14e0bbcafc75c885ee26cc80ba6204664c257 (patch) | |
| tree | be2438efe2ebe06eba92c734e547fdd988293c7b /src/ptp.h | |
| parent | 2a84ca43f10d3fc1fc0bdab3d9dc7f602deb7c9f (diff) | |
| download | libmtp-d1e14e0bbcafc75c885ee26cc80ba6204664c257.tar.gz | |
Refactor and shape up debug calls, bring in upstreams updates.
Diffstat (limited to 'src/ptp.h')
| -rw-r--r-- | src/ptp.h | 27 |
1 files changed, 18 insertions, 9 deletions
@@ -345,12 +345,17 @@ typedef struct _PTPIPHeader PTPIPHeader; #define PTP_OC_NIKON_SetProfileData 0x9009 #define PTP_OC_NIKON_AdvancedTransfer 0x9010 #define PTP_OC_NIKON_GetFileInfoInBlock 0x9011 -#define PTP_OC_NIKON_Capture 0x90C0 -#define PTP_OC_NIKON_SetControlMode 0x90C2 -#define PTP_OC_NIKON_CurveDownload 0x90C5 -#define PTP_OC_NIKON_CurveUpload 0x90C6 -#define PTP_OC_NIKON_CheckEvent 0x90C7 -#define PTP_OC_NIKON_DeviceReady 0x90C8 +#define PTP_OC_NIKON_Capture 0x90C0 /* 1 param, no data */ +#define PTP_OC_NIKON_AfDrive 0x90C1 /* no params, no data */ +#define PTP_OC_NIKON_SetControlMode 0x90C2 /* 1 param, no data */ +#define PTP_OC_NIKON_DelImageSDRAM 0x90C3 /* no params, no data */ +#define PTP_OC_NIKON_CurveDownload 0x90C5 /* 1 param, data in */ +#define PTP_OC_NIKON_CurveUpload 0x90C6 /* 1 param, data out */ +#define PTP_OC_NIKON_CheckEvent 0x90C7 /* no params, data in */ +#define PTP_OC_NIKON_DeviceReady 0x90C8 /* no params, no data */ +#define PTP_OC_NIKON_SetPreWBData 0x90C9 /* 3 params, data out */ + /* 0x90CA */ +#define PTP_OC_NIKON_AfCaptureSDRAM 0x90CB /* no params, no data */ #define PTP_OC_NIKON_GetDevicePTPIPInfo 0x90E0 /* Microsoft / MTP extension codes */ @@ -1114,8 +1119,8 @@ typedef struct _PTPCanon_Property { #define CANON_TRANSFER_SAVE_THUMBNAIL_TO_DEVICE 0x0004 #define CANON_TRANSFER_SAVE_IMAGE_TO_DEVICE 0x0008 /* we use those values: */ -#define CANON_TRANSFER_MEMORY 3 -#define CANON_TRANSFER_CARD 15 +#define CANON_TRANSFER_MEMORY (2|1) +#define CANON_TRANSFER_CARD (8|4|1) #define PTP_DPC_CANON_Zoom 0xD02A #define PTP_DPC_CANON_NamePrefix 0xD02B @@ -1727,7 +1732,10 @@ uint16_t ptp_canon_endshootingmode (PTPParams* params); uint16_t ptp_canon_viewfinderon (PTPParams* params); uint16_t ptp_canon_viewfinderoff (PTPParams* params); -uint16_t ptp_canon_aeafawb (PTPParams* params, uint32_t p1); +#define PTP_CANON_RESET_AE 0x1 +#define PTP_CANON_RESET_AF 0x2 +#define PTP_CANON_RESET_AWB 0x4 +uint16_t ptp_canon_reset_aeafawb (PTPParams* params, uint32_t flags); uint16_t ptp_canon_checkevent (PTPParams* params, PTPUSBEventContainer* event, int* isevent); uint16_t ptp_canon_focuslock (PTPParams* params); @@ -1777,6 +1785,7 @@ uint16_t ptp_nikon_writewifiprofile (PTPParams* params, PTPNIKONWifiProfile* pro uint16_t ptp_nikon_deletewifiprofile (PTPParams* params, uint32_t profilenr); uint16_t ptp_nikon_setcontrolmode (PTPParams* params, uint32_t mode); uint16_t ptp_nikon_capture (PTPParams* params, uint32_t x); +uint16_t ptp_nikon_capture_sdram (PTPParams* params); uint16_t ptp_nikon_check_event (PTPParams* params, PTPUSBEventContainer **evt, int *evtcnt); uint16_t ptp_nikon_getfileinfoinblock (PTPParams* params, uint32_t p1, uint32_t p2, uint32_t p3, unsigned char **data, unsigned int *size); |