Change in libosmo-abis[master]: e1d: Fix compilation after I4a088f91f23aaad05c5ab84a4783c1915d85aca6

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sun Aug 2 09:27:03 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-abis/+/19498 )

Change subject: e1d: Fix compilation after I4a088f91f23aaad05c5ab84a4783c1915d85aca6
......................................................................

e1d: Fix compilation after I4a088f91f23aaad05c5ab84a4783c1915d85aca6

This slipped through the cracks as jenkins so far doesn't build with
--enable-e1d support (fixed in a separate patch).

Change-Id: I505331a4a9430001b049e9f5cc36abf4ce4ca19e
---
M include/internal.h
M src/input/dahdi.c
M src/input/e1d.c
3 files changed, 8 insertions(+), 4 deletions(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/include/internal.h b/include/internal.h
index 8a5aa2e..aeca02f 100644
--- a/include/internal.h
+++ b/include/internal.h
@@ -3,6 +3,9 @@
 
 #include <stdint.h>
 
+/* Amount of data to write to a B-channel in every write() call */
+#define D_BCHAN_TX_GRAN 160
+
 struct osmo_fd;
 struct e1inp_sign_link;
 struct e1inp_ts;
diff --git a/src/input/dahdi.c b/src/input/dahdi.c
index 8cebac3..0cbf9da 100644
--- a/src/input/dahdi.c
+++ b/src/input/dahdi.c
@@ -25,6 +25,7 @@
  */
 
 #include "config.h"
+#include "internal.h"
 
 #include <stdio.h>
 #include <unistd.h>
@@ -355,7 +356,6 @@
         return start;
 }
 
-#define D_BCHAN_TX_GRAN 160
 /* write to a B channel TS */
 static int handle_tsX_write(struct osmo_fd *bfd)
 {
diff --git a/src/input/e1d.c b/src/input/e1d.c
index 3a2f385..be844d5 100644
--- a/src/input/e1d.c
+++ b/src/input/e1d.c
@@ -23,6 +23,7 @@
  */
 
 #include "config.h"
+#include "internal.h"
 
 #ifdef HAVE_E1D
 
@@ -245,7 +246,7 @@
 			}
 			if (bfd->fd <= 0) {
 				bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,
-								   E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE);
+								   E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN);
 			}
 			if (bfd->fd < 0) {
 				LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);
@@ -275,7 +276,7 @@
 			}
 			if (bfd->fd <= 0) {
 				bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,
-								   E1DP_TSMODE_HDLCFCS, D_TSX_ALLOC_SIZE);
+								   E1DP_TSMODE_HDLCFCS, D_BCHAN_TX_GRAN);
 			}
 			if (bfd->fd < 0) {
 				LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);
@@ -298,7 +299,7 @@
 			}
 			if (bfd->fd <= 0) {
 				bfd->fd = osmo_e1dp_client_ts_open(g_e1d, e1d_intf, e1d_line, ts,
-								   E1DP_TSMODE_RAW, D_TSX_ALLOC_SIZE);
+								   E1DP_TSMODE_RAW, D_BCHAN_TX_GRAN);
 			}
 			if (bfd->fd < 0) {
 				LOGPITS(e1i_ts, DLINP, LOGL_ERROR, "Could not open timeslot %d\n", ts);

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/19498
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I505331a4a9430001b049e9f5cc36abf4ce4ca19e
Gerrit-Change-Number: 19498
Gerrit-PatchSet: 1
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200802/a1d6f0ce/attachment.htm>


More information about the gerrit-log mailing list