BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

session: Compile USB-specific code only if available

This commit is contained in:
Daniel Elstner 2015-09-07 17:27:54 +02:00
parent c1adbb1e23
commit 1b8d3a6d09
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/session.c
View File

@ -527,12 +527,14 @@ static int sr_session_iteration(struct sr_session *session)
sr_spew("callback for event source %" G_GINTPTR_FORMAT " with" sr_spew("callback for event source %" G_GINTPTR_FORMAT " with"
" event mask 0x%.2X", poll_object, (unsigned)revents); " event mask 0x%.2X", poll_object, (unsigned)revents);
if (!source->cb(fd, revents, source->cb_data)) { if (!source->cb(fd, revents, source->cb_data)) {
#if HAVE_LIBUSB_1_0
/* Hackish, to be cleaned up when porting to /* Hackish, to be cleaned up when porting to
* the GLib main loop. * the GLib main loop.
*/ */
if (poll_object == (gintptr)session->ctx->libusb_ctx) if (poll_object == (gintptr)session->ctx->libusb_ctx)
usb_source_remove(session, session->ctx); usb_source_remove(session, session->ctx);
else else
#endif
sr_session_source_remove_internal(session, sr_session_source_remove_internal(session,
poll_object); poll_object);
} }
@ -1141,12 +1143,6 @@ SR_PRIV int sr_session_source_remove_internal(struct sr_session *session,
g_array_remove_range(session->pollfds, g_array_remove_range(session->pollfds,
fd_index, source->num_fds); fd_index, source->num_fds);
g_array_remove_index(session->sources, i); g_array_remove_index(session->sources, i);
/*
* This is a bit of a hack. To be removed when
* porting over to the GLib main loop.
*/
if (poll_object == (gintptr)session->ctx->libusb_ctx)
session->ctx->usb_source_present = FALSE;
sr_dbg("Removed event source %" G_GINTPTR_FORMAT ".", sr_dbg("Removed event source %" G_GINTPTR_FORMAT ".",
poll_object); poll_object);