<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-abis/+/19498">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1d: Fix compilation after I4a088f91f23aaad05c5ab84a4783c1915d85aca6<br><br>This slipped through the cracks as jenkins so far doesn't build with<br>--enable-e1d support (fixed in a separate patch).<br><br>Change-Id: I505331a4a9430001b049e9f5cc36abf4ce4ca19e<br>---<br>M include/internal.h<br>M src/input/dahdi.c<br>M src/input/e1d.c<br>3 files changed, 8 insertions(+), 4 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/98/19498/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/internal.h b/include/internal.h</span><br><span>index 8a5aa2e..aeca02f 100644</span><br><span>--- a/include/internal.h</span><br><span>+++ b/include/internal.h</span><br><span>@@ -3,6 +3,9 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Amount of data to write to a B-channel in every write() call */</span><br><span style="color: hsl(120, 100%, 40%);">+#define D_BCHAN_TX_GRAN 160</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_fd;</span><br><span> struct e1inp_sign_link;</span><br><span> struct e1inp_ts;</span><br><span>diff --git a/src/input/dahdi.c b/src/input/dahdi.c</span><br><span>index 8cebac3..0cbf9da 100644</span><br><span>--- a/src/input/dahdi.c</span><br><span>+++ b/src/input/dahdi.c</span><br><span>@@ -25,6 +25,7 @@</span><br><span>  */</span><br><span> </span><br><span> #include "config.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "internal.h"</span><br><span> </span><br><span> #include <stdio.h></span><br><span> #include <unistd.h></span><br><span>@@ -355,7 +356,6 @@</span><br><span>         return start;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define D_BCHAN_TX_GRAN 160</span><br><span> /* write to a B channel TS */</span><br><span> static int handle_tsX_write(struct osmo_fd *bfd)</span><br><span> {</span><br><span>diff --git a/src/input/e1d.c b/src/input/e1d.c</span><br><span>index 3a2f385..be844d5 100644</span><br><span>--- a/src/input/e1d.c</span><br><span>+++ b/src/input/e1d.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span>  */</span><br><span> </span><br><span> #include "config.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "internal.h"</span><br><span> </span><br><span> #ifdef HAVE_E1D</span><br><span> </span><br><span>@@ -245,7 +246,7 @@</span><br><span>                  }</span><br><span>                    if (bfd->fd <= 0) {</span><br><span>                            bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                               E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                               E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN);</span><br><span>                    }</span><br><span>                    if (bfd->fd < 0) {</span><br><span>                             LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);</span><br><span>@@ -275,7 +276,7 @@</span><br><span>                      }</span><br><span>                    if (bfd->fd <= 0) {</span><br><span>                            bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                               E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                               E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN);</span><br><span>                    }</span><br><span>                    if (bfd->fd < 0) {</span><br><span>                             LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);</span><br><span>@@ -298,7 +299,7 @@</span><br><span>                      }</span><br><span>                    if (bfd->fd <= 0) {</span><br><span>                            bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,</span><br><span style="color: hsl(0, 100%, 40%);">-                                                               E1DP_TSMODE_RAW, D_TSX_ALLOC_SIZE);</span><br><span style="color: hsl(120, 100%, 40%);">+                                                                   E1DP_TSMODE_RAW, D_BCHAN_TX_GRAN);</span><br><span>                        }</span><br><span>                    if (bfd->fd < 0) {</span><br><span>                             LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "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/+/19498">change 19498</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/+/19498"/><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: I505331a4a9430001b049e9f5cc36abf4ce4ca19e </div>
<div style="display:none"> Gerrit-Change-Number: 19498 </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>