summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2017-03-16 16:05:45 +0100
committerMarcus Meissner <marcus@jet.franken.de>2017-03-16 16:05:45 +0100
commitfa69f94596830a007e0d54436b877d5658058265 (patch)
treed728ff550b8af32e077242cd2273d3d090b6ed70
parent203df81b9d97e820411e1eb94ae08139af73bbd0 (diff)
downloadlibgphoto2-fa69f94596830a007e0d54436b877d5658058265.tar.gz
merge back from libmtp for their async handling
-rw-r--r--camlibs/ptp2/ptp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index f54d957b8..eda3e1b0d 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -2549,6 +2549,9 @@ struct _PTPParams {
uint16_t response_packet_size;
};
+/* Asynchronous event callback */
+typedef void (*PTPEventCbFn)(PTPParams *params, uint16_t code, PTPContainer *event, void *user_data);
+
/* last, but not least - ptp functions */
uint16_t ptp_usb_sendreq (PTPParams* params, PTPContainer* req, int dataphase);
uint16_t ptp_usb_senddata (PTPParams* params, PTPContainer* ptp,
@@ -2556,6 +2559,7 @@ uint16_t ptp_usb_senddata (PTPParams* params, PTPContainer* ptp,
uint16_t ptp_usb_getresp (PTPParams* params, PTPContainer* resp);
uint16_t ptp_usb_getdata (PTPParams* params, PTPContainer* ptp,
PTPDataHandler *handler);
+uint16_t ptp_usb_event_async (PTPParams *params, PTPEventCbFn cb, void *user_data);
uint16_t ptp_usb_event_wait (PTPParams* params, PTPContainer* event);
uint16_t ptp_usb_event_check (PTPParams* params, PTPContainer* event);
uint16_t ptp_usb_event_check_queue (PTPParams* params, PTPContainer* event);