Don't free trigger when destroying the session.

[libsigrok.git] / src / libsigrok-internal.h

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 86a6326a76f52e881315cea54f3ccdb9b26084bd..3bae560df5d6e15382ff31b2830840a533d4477d 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -206,15 +206,6 @@ struct sr_context {
 #ifdef HAVE_LIBUSB_1_0
        libusb_context *libusb_ctx;
        gboolean usb_source_present;
-#ifdef _WIN32
-       GThread *usb_thread;
-       gboolean usb_thread_running;
-       HANDLE usb_wait_request_event;
-       HANDLE usb_wait_complete_event;
-       GPollFD usb_pollfd;
-       sr_receive_data_callback usb_cb;
-       void *usb_cb_data;
-#endif
 #endif
 };
 
@@ -744,11 +735,14 @@ struct sr_session {
 };
 
 SR_PRIV int sr_session_source_add_internal(struct sr_session *session,
-               const GPollFD *pollfds, int num_fds, int timeout,
-               sr_receive_data_callback cb, void *cb_data,
+               int timeout, sr_receive_data_callback cb, void *cb_data,
                gintptr poll_object);
+SR_PRIV int sr_session_source_poll_add(struct sr_session *session,
+               gintptr poll_object, gintptr fd, int events);
 SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
                gintptr poll_object);
+SR_PRIV int sr_session_source_poll_remove(struct sr_session *session,
+               gintptr poll_object, gintptr fd);
 SR_PRIV int sr_session_send(const struct sr_dev_inst *sdi,
                const struct sr_datafeed_packet *packet);
 SR_PRIV int sr_session_stop_sync(struct sr_session *session);