X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsession.c;h=b88590210c63c4a215f09729c26a76521c8f2690;hb=cbc1413f31f3946ce79da5540cfbeace8924c9d1;hp=ad27a8152c610e35c1fa40d72f46214c82d48f56;hpb=0c536bcd004aa4b4f0ba9673b4d460551e8b16c1;p=libsigrok.git diff --git a/src/session.c b/src/session.c index ad27a815..b8859021 100644 --- a/src/session.c +++ b/src/session.c @@ -985,8 +985,8 @@ SR_PRIV int sr_session_source_add_internal(struct sr_session *session, return ret; } -static int attach_fd_source(struct sr_session *session, - void *key, int fd, int events, int timeout, +SR_PRIV int sr_session_fd_source_add(struct sr_session *session, + void *key, gintptr fd, int events, int timeout, sr_receive_data_callback cb, void *cb_data) { GSource *source; @@ -1027,7 +1027,7 @@ SR_API int sr_session_source_add(struct sr_session *session, int fd, sr_err("Cannot create timer source without timeout."); return SR_ERR_ARG; } - return attach_fd_source(session, GINT_TO_POINTER(fd), + return sr_session_fd_source_add(session, GINT_TO_POINTER(fd), fd, events, timeout, cb, cb_data); } @@ -1054,7 +1054,7 @@ SR_API int sr_session_source_add_pollfd(struct sr_session *session, sr_err("%s: pollfd was NULL", __func__); return SR_ERR_ARG; } - return attach_fd_source(session, pollfd, pollfd->fd, + return sr_session_fd_source_add(session, pollfd, pollfd->fd, pollfd->events, timeout, cb, cb_data); } @@ -1093,7 +1093,7 @@ SR_API int sr_session_source_add_channel(struct sr_session *session, pollfd.fd = g_io_channel_unix_get_fd(channel); pollfd.events = events; #endif - return attach_fd_source(session, channel, pollfd.fd, + return sr_session_fd_source_add(session, channel, pollfd.fd, pollfd.events, timeout, cb, cb_data); }