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.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/19033 )
Change subject: remove code not specific to USB from usb.c to intf_line.c
......................................................................
remove code not specific to USB from usb.c to intf_line.c
Change-Id: I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2
---
M src/Makefile.am
M src/e1d.h
A src/intf_line.c
M src/usb.c
4 files changed, 271 insertions(+), 197 deletions(-)
Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
diff --git a/src/Makefile.am b/src/Makefile.am
index 2890554..bc05998 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@
osmo_e1d_SOURCES = \
ctl.c \
+ intf_line.c \
log.c \
osmo-e1d.c \
usb.c \
diff --git a/src/e1d.h b/src/e1d.h
index 330168b..5b7ba83 100644
--- a/src/e1d.h
+++ b/src/e1d.h
@@ -80,3 +80,15 @@
void *ctx;
struct llist_head interfaces;
};
+
+struct e1_intf *
+e1_intf_new(struct e1_daemon *e1d, void *drv_data);
+
+struct e1_line *
+e1_line_new(struct e1_intf *intf, void *drv_data);
+
+int
+e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts);
+
+int
+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size);
diff --git a/src/intf_line.c b/src/intf_line.c
new file mode 100644
index 0000000..22d5f55
--- /dev/null
+++ b/src/intf_line.c
@@ -0,0 +1,252 @@
+/*
+ * intf_line.c
+ *
+ * (C) 2019 by Sylvain Munaut <tnt at 246tNt.com>
+ *
+ * All Rights Reserved
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <talloc.h>
+
+#include <osmocom/core/isdnhdlc.h>
+#include <osmocom/core/utils.h>
+
+#include "e1d.h"
+#include "log.h"
+
+
+// ---------------------------------------------------------------------------
+// e1d structures
+// ---------------------------------------------------------------------------
+
+struct e1_intf *
+e1_intf_new(struct e1_daemon *e1d, void *drv_data)
+{
+ struct e1_intf *intf;
+
+ intf = talloc_zero(e1d->ctx, struct e1_intf);
+ OSMO_ASSERT(intf);
+
+ intf->e1d = e1d;
+ intf->drv_data = drv_data;
+
+ INIT_LLIST_HEAD(&intf->list);
+ INIT_LLIST_HEAD(&intf->lines);
+
+ if (!llist_empty(&e1d->interfaces)) {
+ struct e1_intf *f = llist_first_entry(&e1d->interfaces, struct e1_intf, list);
+ intf->id = f->id + 1;
+ }
+
+ llist_add(&intf->list, &e1d->interfaces);
+
+ return intf;
+}
+
+struct e1_line *
+e1_line_new(struct e1_intf *intf, void *drv_data)
+{
+ struct e1_line *line;
+
+ line = talloc_zero(intf->e1d->ctx, struct e1_line);
+ OSMO_ASSERT(line);
+
+ line->intf = intf;
+ line->drv_data = drv_data;
+
+ for (int i=0; i<32; i++)
+ line->ts[i].id = i;
+
+ INIT_LLIST_HEAD(&line->list);
+
+ if (!llist_empty(&intf->lines)) {
+ struct e1_line *l = llist_first_entry(&intf->lines, struct e1_line, list);
+ line->id = l->id + 1;
+ }
+
+ llist_add(&line->list, &intf->lines);
+
+ return line;
+}
+
+// ---------------------------------------------------------------------------
+// data transfer
+// ---------------------------------------------------------------------------
+
+static int
+_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
+{
+ int rv, cl, oi;
+
+ oi = 0;
+
+ while (oi < len) {
+ rv = osmo_isdnhdlc_decode(&ts->hdlc_rx,
+ &buf[oi], len-oi, &cl,
+ ts->rx_buf, sizeof(ts->rx_buf)
+ );
+
+ if (rv > 0) {
+ printf("RX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->rx_buf, rv));
+ write(ts->fd, ts->rx_buf, rv);
+ } else if (rv < 0 && ts->id == 4) {
+ printf("ERR RX: %d %d %d [ %s]\n",rv,oi,cl, osmo_hexdump(buf, len));
+ }
+
+ oi += cl;
+ }
+
+ return 0;
+}
+
+static int
+_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
+{
+ int rv, oo, cl;
+
+ oo = 0;
+
+ while (oo < len) {
+ /* Pending message ? */
+ if (!ts->tx_len) {
+ rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));
+ if (rv > 0) {
+ printf("TX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->tx_buf, rv));
+ ts->tx_len = rv;
+ ts->tx_ofs = 0;
+ }
+ }
+
+ /* */
+ rv = osmo_isdnhdlc_encode(&ts->hdlc_tx,
+ &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl,
+ &buf[oo], len - oo
+ );
+
+ if (rv < 0)
+ printf("ERR TX: %d\n", rv);
+
+ if (ts->tx_ofs < ts->tx_len)
+ printf("TX chunk %d/%d %d [ %s]\n", ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));
+
+ if (rv > 0)
+ oo += rv;
+
+ ts->tx_ofs += cl;
+ if (ts->tx_ofs >= ts->tx_len) {
+ ts->tx_len = 0;
+ ts->tx_ofs = 0;
+ }
+ }
+
+ return len;
+}
+
+/*! generate (multiplex) output data for the specified e1_line
+ * \param[in] line E1 line for which to genrate output data
+ * \param[in] buf caller-allocated output buffer for multiplexed data
+ * \param[in] fts number of E1 frames (32 bytes each) to generate
+ * \return number of bytes written to buf */
+int
+e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts)
+{
+ int tsz;
+
+ /* Prepare */
+ tsz = 32 * fts;
+ memset(buf, 0xff, tsz);
+
+ /* Scan timeslots */
+ for (int tsn=1; tsn<32; tsn++)
+ {
+ struct e1_ts *ts = &line->ts[tsn];
+ uint8_t buf_ts[fts];
+ int l;
+
+ if (ts->mode == E1_TS_MODE_OFF)
+ continue;
+
+ switch (ts->mode) {
+ case E1_TS_MODE_RAW:
+ l = read(ts->fd, buf_ts, fts);
+ break;
+ case E1_TS_MODE_HDLCFCS:
+ l = _e1_tx_hdlcfs(ts, buf_ts, fts);
+ break;
+ default:
+ continue;
+ }
+
+ if (l <= 0)
+ continue;
+
+ for (int i=0; i<l; i++)
+ buf[tsn+(i*32)] = buf_ts[i];
+ }
+
+ return tsz;
+}
+
+/*! de-multiplex E1 line data to the individual timeslots.
+ * \param[in] line E1 line on which we operate.
+ * \param[in] buf buffer containing multiplexed frame-aligned E1 data.
+ * \param[in] size size of 'buf' in octets; assumed to be multiple of E1 frame size (32).
+ * \returns 0 on success; negative on error */
+int
+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)
+{
+ int ftr;
+
+ if (size <= 0) {
+ printf("IN ERROR: %d\n", size);
+ return -1;
+ }
+
+ ftr = size / 32;
+ OSMO_ASSERT(size % 32 == 0);
+
+ for (int tsn=1; tsn<32; tsn++)
+ {
+ struct e1_ts *ts = &line->ts[tsn];
+ uint8_t buf_ts[ftr];
+
+ if (ts->mode == E1_TS_MODE_OFF)
+ continue;
+
+ for (int i=0; i<ftr; i++)
+ buf_ts[i] = buf[tsn+(i*32)];
+
+ switch (ts->mode) {
+ case E1_TS_MODE_RAW:
+ write(ts->fd, buf_ts, ftr);
+ break;
+ case E1_TS_MODE_HDLCFCS:
+ _e1_rx_hdlcfs(ts, buf_ts, ftr);
+ break;
+ default:
+ continue;
+ }
+ }
+
+ return 0;
+}
diff --git a/src/usb.c b/src/usb.c
index 19855f8..ecbb54d 100644
--- a/src/usb.c
+++ b/src/usb.c
@@ -105,111 +105,9 @@
// ---------------------------------------------------------------------------
static int
-_e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
-{
- int rv, cl, oi;
-
- oi = 0;
-
- while (oi < len) {
- rv = osmo_isdnhdlc_decode(&ts->hdlc_rx,
- &buf[oi], len-oi, &cl,
- ts->rx_buf, sizeof(ts->rx_buf)
- );
-
- if (rv > 0) {
- printf("RX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->rx_buf, rv));
- write(ts->fd, ts->rx_buf, rv);
- } else if (rv < 0 && ts->id == 4) {
- printf("ERR RX: %d %d %d [ %s]\n",rv,oi,cl, osmo_hexdump(buf, len));
- }
-
- oi += cl;
- }
-
- return 0;
-}
-
-static int
-_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
-{
- int rv, oo, cl;
-
- oo = 0;
-
- while (oo < len) {
- /* Pending message ? */
- if (!ts->tx_len) {
- rv = read(ts->fd, ts->tx_buf, sizeof(ts->tx_buf));
- if (rv > 0) {
- printf("TX Message: %d %d [ %s]\n", ts->id, rv, osmo_hexdump(ts->tx_buf, rv));
- ts->tx_len = rv;
- ts->tx_ofs = 0;
- }
- }
-
- /* */
- rv = osmo_isdnhdlc_encode(&ts->hdlc_tx,
- &ts->tx_buf[ts->tx_ofs], ts->tx_len - ts->tx_ofs, &cl,
- &buf[oo], len - oo
- );
-
- if (rv < 0)
- printf("ERR TX: %d\n", rv);
-
- if (ts->tx_ofs < ts->tx_len)
- printf("TX chunk %d/%d %d [ %s]\n", ts->tx_ofs, ts->tx_len, cl, osmo_hexdump(&buf[ts->tx_ofs], rv));
-
- if (rv > 0)
- oo += rv;
-
- ts->tx_ofs += cl;
- if (ts->tx_ofs >= ts->tx_len) {
- ts->tx_len = 0;
- ts->tx_ofs = 0;
- }
- }
-
- return len;
-}
-
-static int
e1_usb_xfer_in(struct e1_usb_flow *flow, uint8_t *buf, int size)
{
- struct e1_line *line = flow->line;
- int ftr;
-
- if (size <= 0) {
- printf("IN ERROR: %d\n", size);
- return -1;
- }
-
- ftr = (size - 4) / 32;
-
- for (int tsn=1; tsn<32; tsn++)
- {
- struct e1_ts *ts = &line->ts[tsn];
- uint8_t buf_ts[32];
-
- if (ts->mode == E1_TS_MODE_OFF)
- continue;
-
- for (int i=0; i<ftr; i++)
- buf_ts[i] = buf[4+tsn+(i*32)];
-
- switch (ts->mode) {
- case E1_TS_MODE_RAW:
- write(ts->fd, buf_ts, ftr);
- break;
- case E1_TS_MODE_HDLCFCS:
- _e1_rx_hdlcfs(ts, buf_ts, ftr);
- break;
- default:
- continue;
- }
- }
-
- return 0;
+ return e1_line_demux_in(flow->line, buf + 4, size - 4);
}
static int
@@ -217,7 +115,7 @@
{
struct e1_line *line = flow->line;
struct e1_usb_line_data *ld = (struct e1_usb_line_data *) line->drv_data;
- int fts, tsz;
+ int fts;
if (size <= 0) {
printf("OUT ERROR: %d\n", size);
@@ -235,42 +133,9 @@
if (ld->r_acc & 0x80000000)
ld->r_acc = 0;
- /* Prepare */
- tsz = 4 + 32 * fts;
- memset(buf, 0xff, tsz);
+ memset(buf, 0xff, 4);
- /* Header */
- /* FIXME */
-
- /* Scan timeslots */
- for (int tsn=1; tsn<32; tsn++)
- {
- struct e1_ts *ts = &line->ts[tsn];
- uint8_t buf_ts[32];
- int l;
-
- if (ts->mode == E1_TS_MODE_OFF)
- continue;
-
- switch (ts->mode) {
- case E1_TS_MODE_RAW:
- l = read(ts->fd, buf_ts, fts);
- break;
- case E1_TS_MODE_HDLCFCS:
- l = _e1_tx_hdlcfs(ts, buf_ts, fts);
- break;
- default:
- continue;
- }
-
- if (l <= 0)
- continue;
-
- for (int i=0; i<l; i++)
- buf[4+tsn+(i*32)] = buf_ts[i];
- }
-
- return tsz;
+ return e1_line_mux_out(line, buf+4, fts);
}
static int
@@ -410,62 +275,6 @@
// ---------------------------------------------------------------------------
-// e1d structures
-// ---------------------------------------------------------------------------
-
-struct e1_intf *
-_e1_intf_new(struct e1_daemon *e1d, void *drv_data)
-{
- struct e1_intf *intf;
-
- intf = talloc_zero(e1d->ctx, struct e1_intf);
- OSMO_ASSERT(intf);
-
- intf->e1d = e1d;
- intf->drv_data = drv_data;
-
- INIT_LLIST_HEAD(&intf->list);
- INIT_LLIST_HEAD(&intf->lines);
-
- if (!llist_empty(&e1d->interfaces)) {
- struct e1_intf *f = llist_first_entry(&e1d->interfaces, struct e1_intf, list);
- intf->id = f->id + 1;
- }
-
- llist_add(&intf->list, &e1d->interfaces);
-
- return intf;
-}
-
-struct e1_line *
-_e1_line_new(struct e1_intf *intf, void *drv_data)
-{
- struct e1_line *line;
-
- line = talloc_zero(intf->e1d->ctx, struct e1_line);
- OSMO_ASSERT(line);
-
- line->intf = intf;
- line->drv_data = drv_data;
-
- for (int i=0; i<32; i++)
- line->ts[i].id = i;
-
- INIT_LLIST_HEAD(&line->list);
-
- if (!llist_empty(&intf->lines)) {
- struct e1_line *l = llist_first_entry(&intf->lines, struct e1_line, list);
- line->id = l->id + 1;
- }
-
- llist_add(&line->list, &intf->lines);
-
- return line;
-}
-
-
-
-// ---------------------------------------------------------------------------
// Init / Probing
// ---------------------------------------------------------------------------
@@ -490,7 +299,7 @@
intf_data = talloc_zero(e1d->ctx, struct e1_usb_intf_data);
intf_data->devh = devh;
- intf = _e1_intf_new(e1d, intf_data);
+ intf = e1_intf_new(e1d, intf_data);
ret = libusb_get_active_config_descriptor(dev, &cd);
if (ret) {
@@ -551,7 +360,7 @@
return -EINVAL;
}
- line = _e1_line_new(intf, line_data);
+ line = e1_line_new(intf, line_data);
line_data->flow_in = e1uf_create(line, e1_usb_xfer_in, line_data->ep_in, 2, line_data->pkt_size, 4);
line_data->flow_out = e1uf_create(line, e1_usb_xfer_out, line_data->ep_out, 2, line_data->pkt_size, 4);
--
To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/19033
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-e1d
Gerrit-Branch: master
Gerrit-Change-Id: I7d4d4ab39cb3e7e6a7eb8e738a367122eb3fbee2
Gerrit-Change-Number: 19033
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge at osmocom.org>
Gerrit-Assignee: tnt <tnt at 246tNt.com>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: tnt <tnt at 246tNt.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200630/0d15951c/attachment.htm>