<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/19083">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">input/e1d: Add missing "RAW" timeslot support<br><br>Change-Id: Ia4ef5fd40ce15f824a3cbfec533dde2169464c3b<br>---<br>M src/input/e1d.c<br>1 file changed, 72 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index 38483c9..beef93e 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -187,6 +187,72 @@</span><br><span> return ret;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* write to a raw channel TS */</span><br><span style="color: hsl(120, 100%, 40%);">+static int handle_ts_raw_write(struct osmo_fd *bfd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_line *line = bfd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int ts_nr = bfd->priv_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg;</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* get the next msg for this timeslot */</span><br><span style="color: hsl(120, 100%, 40%);">+ msg = e1inp_tx_ts(e1i_ts, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</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%);">+ if (msg->len != D_BCHAN_TX_GRAN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This might lead to a transmit underrun, as we call tx</span><br><span style="color: hsl(120, 100%, 40%);">+ * from the rx path, as there's no select/poll on dahdi</span><br><span style="color: hsl(120, 100%, 40%);">+ * */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unexpected msg->len = %u, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "expected %u\n", msg->len, D_BCHAN_TX_GRAN);</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%);">+ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN TX: %s\n", osmo_hexdump(msg->data, msg->len));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (0/*invertbits*/)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_revbytebits_buf(msg->data, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = write(bfd->fd, msg->data, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret < msg->len)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "send returns %d instead of %d\n", ret, msg->len);</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_free(msg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</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 handle_ts_raw_read(struct osmo_fd *bfd)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_line *line = bfd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int ts_nr = bfd->priv_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1inp_ts *e1i_ts = &line->ts[ts_nr-1];</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = msgb_alloc(D_TSX_ALLOC_SIZE, "E1D Raw TS");</span><br><span style="color: hsl(120, 100%, 40%);">+ int ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOMEM;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = read(bfd->fd, msg->data, D_TSX_ALLOC_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ret < 0 || ret != D_TSX_ALLOC_SIZE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLINP, LOGL_DEBUG, "read error %d %s\n", ret, strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</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 (0/*invertbits*/)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_revbytebits_buf(msg->data, ret);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msgb_put(msg, ret);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->l2h = msg->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPITS(e1i_ts, DLMIB, LOGL_DEBUG, "RAW CHAN RX: %s\n", osmo_hexdump(msgb_l2(msg), ret));</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = e1inp_rx_ts(e1i_ts, msg, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* physical layer indicates that data has been sent,</span><br><span style="color: hsl(120, 100%, 40%);">+ * we thus can send some more data */</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = handle_ts_raw_write(bfd);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return ret;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> static void</span><br><span> e1d_write_msg(struct msgb *msg, void *cbdata)</span><br><span>@@ -225,6 +291,12 @@</span><br><span> if (what & BSC_FD_WRITE)</span><br><span> ret = handle_ts_trau_write(bfd);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1INP_TS_TYPE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & BSC_FD_READ)</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = handle_ts_raw_read(bfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (what & BSC_FD_WRITE)</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = handle_ts_raw_write(bfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> default:</span><br><span> LOGPITS(e1i_ts, DLINP, LOGL_NOTICE, "unknown/unsupported E1 TS type %u\n", e1i_ts->type);</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/19083">change 19083</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/libosmo-abis/+/19083"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-abis </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia4ef5fd40ce15f824a3cbfec533dde2169464c3b </div>
<div style="display:none"> Gerrit-Change-Number: 19083 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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-MessageType: merged </div>