diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2018-12-01 17:47:49 +0100 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2018-12-01 17:47:49 +0100 |
commit | 2cfd1c49cf68dc4e3464a84d61e03e14929abc49 (patch) | |
tree | 225eb47b8cfa9e596b355c9f372db1a711ec85e7 | |
parent | cebd7de68aab0afe3f9d91f63260075de26ab0e2 (diff) | |
download | libgphoto2-2cfd1c49cf68dc4e3464a84d61e03e14929abc49.tar.gz |
merge from libmtp
-rw-r--r-- | camlibs/ptp2/ptp.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h index dd4364133..44fe9dbef 100644 --- a/camlibs/ptp2/ptp.h +++ b/camlibs/ptp2/ptp.h @@ -2667,6 +2667,7 @@ typedef uint16_t (* PTPIOGetResp) (PTPParams* params, PTPContainer* resp); typedef uint16_t (* PTPIOGetData) (PTPParams* params, PTPContainer* ptp, PTPDataHandler *putter); typedef uint16_t (* PTPIOCancelReq) (PTPParams* params, uint32_t transaction_id); +typedef uint16_t (* PTPIODevStatReq) (PTPParams* params); /* debug functions */ typedef void (* PTPErrorFunc) (void *data, const char *format, va_list args) @@ -2728,6 +2729,7 @@ struct _PTPParams { PTPIOGetResp event_check_queue; PTPIOGetResp event_wait; PTPIOCancelReq cancelreq_func; + PTPIODevStatReq devstatreq_func; /* Custom error and debug function */ PTPErrorFunc error_func; @@ -2838,6 +2840,7 @@ uint16_t ptp_usb_control_get_extended_event_data (PTPParams *params, char *buffe uint16_t ptp_usb_control_device_reset_request (PTPParams *params); uint16_t ptp_usb_control_get_device_status (PTPParams *params, char *buffer, int *size); uint16_t ptp_usb_control_cancel_request (PTPParams *params, uint32_t transid); +uint16_t ptp_usb_control_device_status_request (PTPParams *params); int ptp_ptpip_connect (PTPParams* params, const char *port); |