<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16822">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: Use line->port_nr to specify e1d interface/line<br><br>This way we can support more than one E1 line via osmo-e1d.  As<br>neither mISDN nor DAHDI distinguish between mutliple cards of single<br>ports vs. multi-port cards, we havee to map both interface + line number<br>into a single uint8_t.<br><br>Change-Id: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13<br>---<br>M src/input/e1d.c<br>1 file changed, 11 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/22/16822/1</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 c15c081..e111d14 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -179,11 +179,17 @@</span><br><span>     int ts;</span><br><span>      int ret;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+  /* we use higher 4 bits for interface, lower 4 bits for line,</span><br><span style="color: hsl(120, 100%, 40%);">+  * resulting in max. 16 interfaces with 16 lines each */</span><br><span style="color: hsl(120, 100%, 40%);">+      uint8_t e1d_intf = (line->port_nr >> 4) & 0xF;</span><br><span style="color: hsl(120, 100%, 40%);">+   uint8_t e1d_line = line->port_nr & 0xF;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>     if (line->driver != &e1d_driver)</span><br><span>              return -EINVAL;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLINP, LOGL_ERROR, "Line update %d %d %d\n", line->num, line->port_nr, line->num_ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLINP, LOGL_NOTICE, "Line update %d %d=E1D(%d:%d) %d\n", line->num, line->port_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+               e1d_intf, e1d_line, line->num_ts);</span><br><span> </span><br><span>    for (ts=1; ts<line->num_ts; ts++)</span><br><span>      {</span><br><span>@@ -212,8 +218,10 @@</span><br><span>                     }</span><br><span>                         continue;</span><br><span>               case E1INP_TS_TYPE_SIGN:</span><br><span style="color: hsl(0, 100%, 40%);">-                        if (bfd->fd <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">-                         bfd->fd = osmo_e1dp_client_ts_open(g_e1d, 0, 0, ts, E1DP_TSMODE_HDLCFCS);</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (bfd->fd <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                             bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,</span><br><span style="color: hsl(120, 100%, 40%);">+                                                             E1DP_TSMODE_HDLCFCS);</span><br><span style="color: hsl(120, 100%, 40%);">+                      }</span><br><span>                    if (bfd->fd < 0) {</span><br><span>                             LOGP(DLINP, LOGL_ERROR,</span><br><span>                                      "Could not open timeslot %d\n", ts);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-abis/+/16822">change 16822</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/+/16822"/><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: I3b6975624a0155a68d2c67bfdbc1fb751fb50b13 </div>
<div style="display:none"> Gerrit-Change-Number: 16822 </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>