<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19229">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">introduce concept of superchannel to data structures + CTL<br><br>We treat the superchannel as an extra, separate timeslot. Initially<br>I thought of simply re-using TS1, but keeping the superchannel<br>separate ensures that it doesn't inherit any state (like half-sent<br>HDLC frames) from another timeslot when we switch between the modes<br>at runtime.<br><br>Change-Id: I0aacf251e155de2bb6ad03ffc4181067b22f1c90<br>---<br>M include/osmocom/e1d/proto.h<br>M src/ctl.c<br>M src/e1d.h<br>M src/intf_line.c<br>4 files changed, 30 insertions(+), 4 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/19229/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/e1d/proto.h b/include/osmocom/e1d/proto.h</span><br><span>index 56064b8..6711332 100644</span><br><span>--- a/include/osmocom/e1d/proto.h</span><br><span>+++ b/include/osmocom/e1d/proto.h</span><br><span>@@ -71,6 +71,7 @@</span><br><span> </span><br><span> #define E1DP_MAGIC 0x00e1</span><br><span> #define E1DP_MAX_LEN 4096</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1DP_TS_SUPERCHAN 0xfe</span><br><span> #define E1DP_INVALID 0xff</span><br><span> #define E1DP_DEFAULT_SOCKET "/tmp/osmo-e1d.ctl"</span><br><span> </span><br><span>diff --git a/src/ctl.c b/src/ctl.c</span><br><span>index 482366f..5322ab4 100644</span><br><span>--- a/src/ctl.c</span><br><span>+++ b/src/ctl.c</span><br><span>@@ -68,7 +68,12 @@</span><br><span> static struct e1_ts *</span><br><span> _e1d_get_ts(struct e1_line *line, uint8_t ts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return (ts < 32) ? &line->ts[ts] : NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts < 32)</span><br><span style="color: hsl(120, 100%, 40%);">+ return &line->ts[ts];</span><br><span style="color: hsl(120, 100%, 40%);">+ else if (ts == E1DP_TS_SUPERCHAN)</span><br><span style="color: hsl(120, 100%, 40%);">+ return &line->superchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> static void</span><br><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index f556e8f..2b8e32b 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -55,15 +55,28 @@</span><br><span> int fd;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum e1_line_mode {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 31 individual 64k timeslots, as used on 3GPP Abis, 3GPP A or ISDN */</span><br><span style="color: hsl(120, 100%, 40%);">+ E1_LINE_MODE_CHANNELIZED,</span><br><span style="color: hsl(120, 100%, 40%);">+ /* 1 channel group spanning all 31 TS, as used e.g. when using Frame Relay</span><br><span style="color: hsl(120, 100%, 40%);">+ * or raw HDLC over channelized E1. */</span><br><span style="color: hsl(120, 100%, 40%);">+ E1_LINE_MODE_SUPERCHANNEL,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct e1_line {</span><br><span> struct llist_head list;</span><br><span> </span><br><span> struct e1_intf *intf;</span><br><span> uint8_t id;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ enum e1_line_mode mode;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void *drv_data;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* timeslots for channelized mode */</span><br><span> struct e1_ts ts[32];</span><br><span style="color: hsl(120, 100%, 40%);">+ /* superchannel */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts superchan;</span><br><span> };</span><br><span> </span><br><span> enum e1_driver {</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 5994805..75da211 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -90,6 +90,13 @@</span><br><span> talloc_free(intf);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void ts_init(struct e1_ts *ts, struct e1_line *line, int id)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->line = line;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->id = id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct e1_line *</span><br><span> e1_line_new(struct e1_intf *intf, void *drv_data)</span><br><span> {</span><br><span>@@ -100,12 +107,12 @@</span><br><span> </span><br><span> line->intf = intf;</span><br><span> line->drv_data = drv_data;</span><br><span style="color: hsl(120, 100%, 40%);">+ line->mode = E1_LINE_MODE_CHANNELIZED;</span><br><span> </span><br><span> for (int i=0; i<32; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- line->ts[i].line = line;</span><br><span style="color: hsl(0, 100%, 40%);">- line->ts[i].id = i;</span><br><span style="color: hsl(0, 100%, 40%);">- line->ts[i].fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_init(&line->ts[i], line, i);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ ts_init(&line->superchan, line, 255);</span><br><span> </span><br><span> INIT_LLIST_HEAD(&line->list);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19229">change 19229</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/+/19229"/><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: I0aacf251e155de2bb6ad03ffc4181067b22f1c90 </div>
<div style="display:none"> Gerrit-Change-Number: 19229 </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>