<p>tnt <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/16645">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">port to new libosmousb<br><br>libosmousb, recently introduced to libosmocore.git, is taking care<br>of main loop integration of libusb into osmo_select_main(). This<br>means we don't need to do any polling here anymore.<br><br>Change-Id: I3f3b61dfa217d6ef8c17970b2cf1cc627bb13bbe<br>---<br>M configure.ac<br>M src/Makefile.am<br>M src/osmo-e1d.c<br>M src/usb.c<br>4 files changed, 6 insertions(+), 18 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure.ac b/configure.ac</span><br><span>index 91d34e8..c0508eb 100644</span><br><span>--- a/configure.ac</span><br><span>+++ b/configure.ac</span><br><span>@@ -33,6 +33,7 @@</span><br><span> PKG_CHECK_MODULES(TALLOC, [talloc >= 2.0.1])</span><br><span> </span><br><span> PKG_CHECK_MODULES(LIBOSMOCORE, libosmocore >= 1.0.1.120)</span><br><span style="color: hsl(120, 100%, 40%);">+PKG_CHECK_MODULES(LIBOSMOUSB, libosmousb)</span><br><span> PKG_CHECK_MODULES(LIBUSB, libusb-1.0 >= 1.0.21)</span><br><span> </span><br><span> AC_CONFIG_MACRO_DIR([m4])</span><br><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index fd9ec35..2890554 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -4,7 +4,7 @@</span><br><span> LIBVERSION=0:0:0</span><br><span> </span><br><span> AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)</span><br><span style="color: hsl(0, 100%, 40%);">-AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) $(LIBUSB_CFLAGS)</span><br><span style="color: hsl(120, 100%, 40%);">+AM_CFLAGS=-Wall -Wno-unused-result $(LIBOSMOCORE_CFLAGS) $(LIBOSMOUSB_LIBS) $(LIBUSB_CFLAGS)</span><br><span> </span><br><span> lib_LTLIBRARIES = libosmo-e1d.la</span><br><span> </span><br><span>@@ -35,4 +35,4 @@</span><br><span> usb.c \</span><br><span> $(NULL)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-osmo_e1d_LDADD = $(LIBOSMOCORE_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la</span><br><span style="color: hsl(120, 100%, 40%);">+osmo_e1d_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOUSB_LIBS) $(LIBUSB_LIBS) libosmo-e1d.la</span><br><span>diff --git a/src/osmo-e1d.c b/src/osmo-e1d.c</span><br><span>index fa3fc6c..92d98d3 100644</span><br><span>--- a/src/osmo-e1d.c</span><br><span>+++ b/src/osmo-e1d.c</span><br><span>@@ -42,7 +42,6 @@</span><br><span> </span><br><span> extern struct osmo_e1dp_server_handler e1d_ctl_handlers[];</span><br><span> extern int e1_usb_probe(struct e1_daemon *e1d);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int e1_usb_poll(void);</span><br><span> </span><br><span> </span><br><span> </span><br><span>@@ -122,8 +121,7 @@</span><br><span> </span><br><span> /* main loop */</span><br><span> while (!g_shutdown) {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_select_main(1);</span><br><span style="color: hsl(0, 100%, 40%);">- e1_usb_poll();</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_select_main(0);</span><br><span> }</span><br><span> </span><br><span> /* cleanup */</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index 18e3053..19855f8 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -30,6 +30,7 @@</span><br><span> </span><br><span> #include <osmocom/core/isdnhdlc.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/usb/libusb.h></span><br><span> </span><br><span> #include <libusb.h></span><br><span> </span><br><span>@@ -572,7 +573,7 @@</span><br><span> int i, ret;</span><br><span> </span><br><span> if (!g_usb) {</span><br><span style="color: hsl(0, 100%, 40%);">- ret = libusb_init(&g_usb);</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = osmo_libusb_init(&g_usb);</span><br><span> if (ret) {</span><br><span> LOGP(DE1D, LOGL_ERROR, "Failed to initialize libusb\n");</span><br><span> return -EIO;</span><br><span>@@ -602,15 +603,3 @@</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int</span><br><span style="color: hsl(0, 100%, 40%);">-e1_usb_poll(void)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rv = libusb_handle_events(g_usb);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv != LIBUSB_SUCCESS)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EIO;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/16645">change 16645</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-e1d/+/16645"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I3f3b61dfa217d6ef8c17970b2cf1cc627bb13bbe </div>
<div style="display:none"> Gerrit-Change-Number: 16645 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>