<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19929">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1-prbs-test: Add support for osmo-e1d<br><br>This allows e1-prbs-test to not only use DAHDI devices, but also<br>osmo-e1d supported devices<br><br>Change-Id: I0e88f2b056db931b0e442567efa9a8d270abb9f2<br>---<br>M contrib/e1-prbs-test/Makefile<br>M contrib/e1-prbs-test/main.c<br>2 files changed, 55 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/29/19929/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/contrib/e1-prbs-test/Makefile b/contrib/e1-prbs-test/Makefile</span><br><span>index 172847f..598366a 100644</span><br><span>--- a/contrib/e1-prbs-test/Makefile</span><br><span>+++ b/contrib/e1-prbs-test/Makefile</span><br><span>@@ -1,5 +1,5 @@</span><br><span style="color: hsl(0, 100%, 40%);">-LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore)</span><br><span style="color: hsl(0, 100%, 40%);">-LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore)</span><br><span style="color: hsl(120, 100%, 40%);">+LIBOSMO_CFLAGS:=$(shell pkg-config --cflags libosmocore libosmo-e1d)</span><br><span style="color: hsl(120, 100%, 40%);">+LIBOSMO_LIBS:=$(shell pkg-config --libs libosmocore libosmo-e1d)</span><br><span> </span><br><span> CFLAGS=-O2 -g -Wall -Werror $(LIBOSMO_CFLAGS)</span><br><span> LIBS=$(LIBOSMO_LIBS)</span><br><span>diff --git a/contrib/e1-prbs-test/main.c b/contrib/e1-prbs-test/main.c</span><br><span>index 4fe0e84..a124087 100644</span><br><span>--- a/contrib/e1-prbs-test/main.c</span><br><span>+++ b/contrib/e1-prbs-test/main.c</span><br><span>@@ -40,6 +40,8 @@</span><br><span> #include <osmocom/core/bits.h></span><br><span> #include <osmocom/core/prbs.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/e1d/proto_clnt.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include "internal.h"</span><br><span> </span><br><span> static struct test_state g_tst;</span><br><span>@@ -69,12 +71,58 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void init_timeslot(struct timeslot_state *ts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_register(&ts->ofd);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("E1TS(%02u) opened\n", ts->ofd.priv_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_init_prbs_tx(ts, g_prbs_offs_tx);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_init_prbs_rx(ts, g_prbs_offs_rx);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* start to put something into the transmit queue, before we get read-triggered</span><br><span style="color: hsl(120, 100%, 40%);">+ * later on */</span><br><span style="color: hsl(120, 100%, 40%);">+ process_tx(ts, 1024);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int open_slots_e1d(struct test_state *tst, int intf_nr, int line_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_e1dp_client *clnt = osmo_e1dp_client_create(NULL, E1DP_DEFAULT_SOCKET);</span><br><span style="color: hsl(120, 100%, 40%);">+ int i, rc, num_slots = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!clnt) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Unable to connect to osmo-e1d\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 1; i < 32; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct timeslot_state *ts;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_e1dp_client_ts_open(clnt, intf_nr, line_nr, i, E1DP_TSMODE_RAW, 1024);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "Error opening %d: %d (%s)\n", i, rc, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ ts = &tst->ts[tst->next_unused_ts++];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* open the respective file descriptor */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, i);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ init_timeslot(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ num_slots++;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return num_slots;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int open_slots(struct test_state *tst, const char *basedir)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- DIR *dir = opendir(basedir);</span><br><span style="color: hsl(120, 100%, 40%);">+ DIR *dir;</span><br><span> struct dirent *ent;</span><br><span> int rc, num_slots = 0;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(basedir, "e1d"))</span><br><span style="color: hsl(120, 100%, 40%);">+ return open_slots_e1d(tst, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ dir = opendir(basedir);</span><br><span> if (!dir)</span><br><span> return -ENOENT;</span><br><span> </span><br><span>@@ -99,15 +147,6 @@</span><br><span> </span><br><span> /* open the respective file descriptor */</span><br><span> osmo_fd_setup(&ts->ofd, rc, BSC_FD_READ, e1_fd_cb, ts, atoi(ent->d_name));</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_fd_register(&ts->ofd);</span><br><span style="color: hsl(0, 100%, 40%);">- printf("E1TS(%02u) opened\n", ts->ofd.priv_nr);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts_init_prbs_tx(ts, g_prbs_offs_tx);</span><br><span style="color: hsl(0, 100%, 40%);">- ts_init_prbs_rx(ts, g_prbs_offs_rx);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* start to put something into the transmit queue, before we get read-triggered</span><br><span style="color: hsl(0, 100%, 40%);">- * later on */</span><br><span style="color: hsl(0, 100%, 40%);">- process_tx(ts, 1024);</span><br><span> </span><br><span> cfg_dahdi_buffer(ts->ofd.fd);</span><br><span> struct dahdi_bufferinfo bi;</span><br><span>@@ -115,6 +154,8 @@</span><br><span> OSMO_ASSERT(rc == 0);</span><br><span> printf("tx_pol=%d, rx_pol=%d, num=%d, size=%d, nread=%d, nwrite=%d\n",</span><br><span> bi.txbufpolicy, bi.rxbufpolicy, bi.numbufs, bi.bufsize, bi.readbufs, bi.writebufs); </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ init_timeslot(ts);</span><br><span> num_slots++;</span><br><span> }</span><br><span> closedir(dir);</span><br><span>@@ -198,6 +239,8 @@</span><br><span> </span><br><span> set_realtime(10);</span><br><span> rc = open_slots(&g_tst, basedir);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ exit(1);</span><br><span> printf("==> opened a total of %d slots\n", rc);</span><br><span> </span><br><span> signal(SIGINT, sig_handler);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19929">change 19929</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/+/19929"/><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: I0e88f2b056db931b0e442567efa9a8d270abb9f2 </div>
<div style="display:none"> Gerrit-Change-Number: 19929 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>