<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19033">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remove code not specific to USB from usb.c to intf_line.c<br><br>Change-Id: I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2<br>---<br>M src/Makefile.am<br>M src/e1d.h<br>A src/intf_line.c<br>M src/usb.c<br>4 files changed, 271 insertions(+), 197 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index 2890554..bc05998 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -30,6 +30,7 @@</span><br><span> </span><br><span> osmo_e1d_SOURCES = \</span><br><span> ctl.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ intf_line.c \</span><br><span> log.c \</span><br><span> osmo-e1d.c \</span><br><span> usb.c \</span><br><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index 330168b..5b7ba83 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -80,3 +80,15 @@</span><br><span> void *ctx;</span><br><span> struct llist_head interfaces;</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1_intf *</span><br><span style="color: hsl(120, 100%, 40%);">+e1_intf_new(struct e1_daemon *e1d, void *drv_data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct e1_line *</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_new(struct e1_intf *intf, void *drv_data);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size);</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>new file mode 100644</span><br><span>index 0000000..22d5f55</span><br><span>--- /dev/null</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -0,0 +1,252 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * intf_line.c</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2019 by Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * SPDX-License-Identifier: GPL-2.0+</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(120, 100%, 40%);">+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</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%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/isdnhdlc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "e1d.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "log.h"</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%);">+// ---------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+// e1d structures</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%);">+struct e1_intf *</span><br><span style="color: hsl(120, 100%, 40%);">+e1_intf_new(struct e1_daemon *e1d, void *drv_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_intf *intf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ intf = talloc_zero(e1d->ctx, struct e1_intf);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(intf);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ intf->e1d = e1d;</span><br><span style="color: hsl(120, 100%, 40%);">+ intf->drv_data = drv_data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&intf->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&intf->lines);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!llist_empty(&e1d->interfaces)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_intf *f = llist_first_entry(&e1d->interfaces, struct e1_intf, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ intf->id = f->id + 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%);">+ llist_add(&intf->list, &e1d->interfaces);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return intf;</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%);">+struct e1_line *</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_new(struct e1_intf *intf, void *drv_data)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_line *line;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ line = talloc_zero(intf->e1d->ctx, struct e1_line);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(line);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ line->intf = intf;</span><br><span style="color: hsl(120, 100%, 40%);">+ line->drv_data = drv_data;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i=0; i<32; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts[i].id = i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&line->list);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!llist_empty(&intf->lines)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_line *l = llist_first_entry(&intf->lines, struct e1_line, list);</span><br><span style="color: hsl(120, 100%, 40%);">+ line->id = l->id + 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%);">+ llist_add(&line->list, &intf->lines);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return line;</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%);">+// ---------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+// data transfer</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</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv, cl, oi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (oi < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_isdnhdlc_decode(&ts->hdlc_rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &buf[oi], len-oi, &cl,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->rx_buf, sizeof(ts->rx_buf)</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%);">+ if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ write(ts->fd, ts->rx_buf, rv);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rv < 0 && ts->id == 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERR RX: %d %d %d [ %s]\n",rv,oi,cl, osmo_hexdump(buf, len));</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%);">+ oi += cl;</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 0;</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</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv, oo, cl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oo = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (oo < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pending message ? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts->tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("TX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_len = rv; </span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_ofs = 0;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* */</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_isdnhdlc_encode(&ts->hdlc_tx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl,</span><br><span style="color: hsl(120, 100%, 40%);">+ &buf[oo], len - oo</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%);">+ if (rv < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("ERR TX: %d\n", rv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->tx_ofs < ts->tx_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("TX chunk %d/%d %d [ %s]\n", ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ oo += rv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_ofs += cl;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->tx_ofs >= ts->tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->tx_ofs = 0;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</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%);">+/*! generate (multiplex) output data for the specified e1_line</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] line E1 line for which to genrate output data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf caller-allocated output buffer for multiplexed data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fts number of E1 frames (32 bytes each) to generate</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return number of bytes written to buf */</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsz;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prepare */</span><br><span style="color: hsl(120, 100%, 40%);">+ tsz = 32 * fts;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(buf, 0xff, tsz);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Scan timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf_ts[fts];</span><br><span style="color: hsl(120, 100%, 40%);">+ int l;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ts->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ l = read(ts->fd, buf_ts, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(120, 100%, 40%);">+ l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+ if (l <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i=0; i<l; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[tsn+(i*32)] = buf_ts[i];</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 tsz;</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%);">+/*! de-multiplex E1 line data to the individual timeslots.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] line E1 line on which we operate.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf buffer containing multiplexed frame-aligned E1 data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] size size of 'buf' in octets; assumed to be multiple of E1 frame size (32).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative on error */</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int ftr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (size <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("IN ERROR: %d\n", size);</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%);">+ ftr = size / 32;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(size % 32 == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf_ts[ftr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i=0; i<ftr; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_ts[i] = buf[tsn+(i*32)];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ts->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ write(ts->fd, buf_ts, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_rx_hdlcfs(ts, buf_ts, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index 19855f8..ecbb54d 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -105,111 +105,9 @@</span><br><span> // ---------------------------------------------------------------------------</span><br><span> </span><br><span> static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv, cl, oi;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oi = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (oi < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = osmo_isdnhdlc_decode(&ts->hdlc_rx,</span><br><span style="color: hsl(0, 100%, 40%);">- &buf[oi], len-oi, &cl,</span><br><span style="color: hsl(0, 100%, 40%);">- ts->rx_buf, sizeof(ts->rx_buf)</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span style="color: hsl(0, 100%, 40%);">- write(ts->fd, ts->rx_buf, rv);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rv < 0 && ts->id == 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("ERR RX: %d %d %d [ %s]\n",rv,oi,cl, osmo_hexdump(buf, len));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oi += cl;</span><br><span style="color: hsl(0, 100%, 40%);">- }</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 style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv, oo, cl;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oo = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (oo < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Pending message ? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ts->tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("TX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span style="color: hsl(0, 100%, 40%);">- ts->tx_len = rv; </span><br><span style="color: hsl(0, 100%, 40%);">- ts->tx_ofs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* */</span><br><span style="color: hsl(0, 100%, 40%);">- rv = osmo_isdnhdlc_encode(&ts->hdlc_tx,</span><br><span style="color: hsl(0, 100%, 40%);">- &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl,</span><br><span style="color: hsl(0, 100%, 40%);">- &buf[oo], len - oo</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("ERR TX: %d\n", rv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->tx_ofs < ts->tx_len)</span><br><span style="color: hsl(0, 100%, 40%);">- printf("TX chunk %d/%d %d [ %s]\n", ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- oo += rv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts->tx_ofs += cl;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->tx_ofs >= ts->tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- ts->tx_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- ts->tx_ofs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span> e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_line *line = flow->line;</span><br><span style="color: hsl(0, 100%, 40%);">- int ftr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (size <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- printf("IN ERROR: %d\n", size);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ftr = (size - 4) / 32;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf_ts[32];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i=0; i<ftr; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- buf_ts[i] = buf[4+tsn+(i*32)];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ts->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- write(ts->fd, buf_ts, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_rx_hdlcfs(ts, buf_ts, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</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(120, 100%, 40%);">+ return e1_line_demux_in(flow->line, buf + 4, size - 4);</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>@@ -217,7 +115,7 @@</span><br><span> {</span><br><span> struct e1_line *line = flow->line;</span><br><span> struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data;</span><br><span style="color: hsl(0, 100%, 40%);">- int fts, tsz;</span><br><span style="color: hsl(120, 100%, 40%);">+ int fts;</span><br><span> </span><br><span> if (size <= 0) {</span><br><span> printf("OUT ERROR: %d\n", size);</span><br><span>@@ -235,42 +133,9 @@</span><br><span> if (ld->r_acc & 0x80000000)</span><br><span> ld->r_acc = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Prepare */</span><br><span style="color: hsl(0, 100%, 40%);">- tsz = 4 + 32 * fts;</span><br><span style="color: hsl(0, 100%, 40%);">- memset(buf, 0xff, tsz);</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(buf, 0xff, 4);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Header */</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Scan timeslots */</span><br><span style="color: hsl(0, 100%, 40%);">- for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf_ts[32];</span><br><span style="color: hsl(0, 100%, 40%);">- int l;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ts->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- l = read(ts->fd, buf_ts, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(0, 100%, 40%);">- l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (l <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i=0; i<l; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- buf[4+tsn+(i*32)] = buf_ts[i];</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return tsz;</span><br><span style="color: hsl(120, 100%, 40%);">+ return e1_line_mux_out(line, buf+4, fts);</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>@@ -410,62 +275,6 @@</span><br><span> </span><br><span> </span><br><span> // ---------------------------------------------------------------------------</span><br><span style="color: hsl(0, 100%, 40%);">-// e1d structures</span><br><span style="color: hsl(0, 100%, 40%);">-// ---------------------------------------------------------------------------</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct e1_intf *</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_intf_new(struct e1_daemon *e1d, void *drv_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_intf *intf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- intf = talloc_zero(e1d->ctx, struct e1_intf);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(intf);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- intf->e1d = e1d;</span><br><span style="color: hsl(0, 100%, 40%);">- intf->drv_data = drv_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&intf->list);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&intf->lines);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!llist_empty(&e1d->interfaces)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_intf *f = llist_first_entry(&e1d->interfaces, struct e1_intf, list);</span><br><span style="color: hsl(0, 100%, 40%);">- intf->id = f->id + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&intf->list, &e1d->interfaces);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return intf;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct e1_line *</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_line_new(struct e1_intf *intf, void *drv_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_line *line;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- line = talloc_zero(intf->e1d->ctx, struct e1_line);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(line);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- line->intf = intf;</span><br><span style="color: hsl(0, 100%, 40%);">- line->drv_data = drv_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i=0; i<32; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- line->ts[i].id = i;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&line->list);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!llist_empty(&intf->lines)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_line *l = llist_first_entry(&intf->lines, struct e1_line, list);</span><br><span style="color: hsl(0, 100%, 40%);">- line->id = l->id + 1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add(&line->list, &intf->lines);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return line;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-// ---------------------------------------------------------------------------</span><br><span> // Init / Probing</span><br><span> // ---------------------------------------------------------------------------</span><br><span> </span><br><span>@@ -490,7 +299,7 @@</span><br><span> intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data);</span><br><span> intf_data->devh = devh;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- intf = _e1_intf_new(e1d, intf_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ intf = e1_intf_new(e1d, intf_data);</span><br><span> </span><br><span> ret = libusb_get_active_config_descriptor(dev, &cd);</span><br><span> if (ret) {</span><br><span>@@ -551,7 +360,7 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- line = _e1_line_new(intf, line_data);</span><br><span style="color: hsl(120, 100%, 40%);">+ line = e1_line_new(intf, line_data);</span><br><span> </span><br><span> line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 2, line_data->pkt_size, 4);</span><br><span> line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 2, line_data->pkt_size, 4);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19033">change 19033</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/+/19033"/><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: I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2 </div>
<div style="display:none"> Gerrit-Change-Number: 19033 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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>