Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support
Harald Welte has submitted this change and it was merged. (
https://gerrit.osmocom.org/10460 )
Change subject: trxcon/scheduler: add TCH/H channel support
..
trxcon/scheduler: add TCH/H channel support
Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67
---
M src/host/trxcon/sched_lchan_desc.c
M src/host/trxcon/sched_lchan_tchh.c
M src/host/trxcon/sched_trx.c
M src/host/trxcon/sched_trx.h
4 files changed, 331 insertions(+), 7 deletions(-)
Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
diff --git a/src/host/trxcon/sched_lchan_desc.c
b/src/host/trxcon/sched_lchan_desc.c
index 37d1273..4cac439 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -27,10 +27,7 @@
/* TODO: implement */
#define tx_pdtch_fnNULL
-#define tx_tchh_fn NULL
-
#define rx_pdtch_fnNULL
-#define rx_tchh_fn NULL
/* Forward declaration of handlers */
int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
@@ -54,6 +51,14 @@
int tx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);
+int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,
+ sbit_t *bits, int8_t rssi, int16_t toa256);
+
+int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);
+
+
const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
{
TRXC_IDLE, "IDLE",
diff --git a/src/host/trxcon/sched_lchan_tchh.c
b/src/host/trxcon/sched_lchan_tchh.c
index 316f995..7fb2809 100644
--- a/src/host/trxcon/sched_lchan_tchh.c
+++ b/src/host/trxcon/sched_lchan_tchh.c
@@ -3,6 +3,7 @@
* TDMA scheduler: handlers for DL / UL bursts on logical channels
*
* (C) 2018 by Vadim Yanitskiy
+ * (C) 2018 by Harald Welte
*
* All Rights Reserved
*
@@ -23,11 +24,27 @@
*/
#include
+#include
#include
#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
+#include "logging.h"
+#include "trx_if.h"
+#include "trxcon.h"
+#include "l1ctl.h"
static const uint8_t tch_h0_traffic_block_map[3][4] = {
/* B0(0,2,4,6), B1(4,6,8,10), B2(8,10,0,2) */
@@ -181,3 +198,305 @@
/* Couldn't calculate the first fn, return the last */
return last_fn;
}
+
+int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,
+ sbit_t *bits, int8_t rssi, int16_t toa256)
+{
+ const struct trx_lchan_desc *lchan_desc;
+ int n_errors = -1, n_bits_total, rc;
+ sbit_t *buffer, *offset;
+ uint8_t l2[128], *mask;
+ size_t l2_len;
+
+ /* Set up pointers */
+ lchan_desc = &trx_lchan_desc[lchan->type];
+ mask = &lchan->rx_burst_mask;
+ buffer = lchan->rx_bursts;
+
+ LOGP(DSCHD, LOGL_DEBUG, "Traffic received on %s: fn=%u ts=%u bid=%u\n",
+ lchan_desc->name, fn, ts->index, bid);
+
+ if (*mask == 0x00) {
+ /* Align to the first burst */
+ if (bid > 0)
+ return 0;
+
+ /* Align reception of the first FACCH/H frame */
+ if (lchan->tch_mode == GSM48_CMODE_SIGN) {
+ if (!sched_tchh_facch_start(lchan->type, fn, 0))
+ return 0;
+ } else { /* or TCH/H traffic frame */
+ if (!sched_tchh_traffic_start(lchan->type, fn, 0))
+ return 0;
+ }
+ }
+
+ /* Update mask */
+ *mask |= (1 << bid);
+
+ /**
+* FIXME: properly update measurements
+*
+* Since TCH/H channel is using block-diagonal interleaving,
+* a single burst may carry 57 bits of one encoded frame,
+* and 57 bits of another. This should be taken into account.
+*/
+ lchan->meas.rssi_sum += rssi;
+ lchan->meas.toa256_sum += toa256;
+ lchan->meas.rssi_num++;
+ lchan->meas.toa256_num++;
+
+ /* Copy burst to the end of buffer of 6 bursts */
+ offset = buffer + bid * 116 + 464;
+ memcpy(offset, bits + 3, 58);
+ memcpy(offset + 58, bits + 87, 58);
+
+ /* Wait until the second burst */
+ if (bid != 1)
+ return 0;
+
+ /* Wait for complete set of bursts */
+ if (lchan->tch_mode == GSM48_CMODE_SIGN) {
+ /* FACCH/H is interleaved over 6 bursts */
+ if ((*mask & 0x3f) != 0x3f)
+ goto bfi_shift;
+ } else {
+ /* Traffic is interleaved over 4 bursts */
+ if ((*mask & 0x0f) != 0x0f)
+ goto bfi_shift;
+ }
+
+ /* Skip deco
Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support
Vadim Yanitskiy has posted comments on this change. ( https://gerrit.osmocom.org/10460 ) Change subject: trxcon/scheduler: add TCH/H channel support .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/10460 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67 Gerrit-Change-Number: 10460 Gerrit-PatchSet: 3 Gerrit-Owner: Vadim Yanitskiy Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Vadim Yanitskiy Gerrit-Comment-Date: Sat, 15 Sep 2018 19:15:05 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmocom-bb[master]: trxcon/scheduler: add TCH/H channel support
Vadim Yanitskiy has uploaded this change for review. (
https://gerrit.osmocom.org/10460
Change subject: trxcon/scheduler: add TCH/H channel support
..
trxcon/scheduler: add TCH/H channel support
Change-Id: Ibb2a0850692c5ff86b13b820af10b12085589e67
---
M src/host/trxcon/Makefile.am
M src/host/trxcon/sched_lchan_desc.c
A src/host/trxcon/sched_lchan_tchh.c
M src/host/trxcon/sched_trx.c
M src/host/trxcon/sched_trx.h
5 files changed, 329 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/60/10460/1
diff --git a/src/host/trxcon/Makefile.am b/src/host/trxcon/Makefile.am
index c9cc170..7095cb5 100644
--- a/src/host/trxcon/Makefile.am
+++ b/src/host/trxcon/Makefile.am
@@ -35,6 +35,7 @@
sched_lchan_desc.c \
sched_lchan_xcch.c \
sched_lchan_tchf.c \
+ sched_lchan_tchh.c \
sched_lchan_rach.c \
sched_lchan_sch.c \
sched_mframe.c \
diff --git a/src/host/trxcon/sched_lchan_desc.c
b/src/host/trxcon/sched_lchan_desc.c
index 37d1273..4cac439 100644
--- a/src/host/trxcon/sched_lchan_desc.c
+++ b/src/host/trxcon/sched_lchan_desc.c
@@ -27,10 +27,7 @@
/* TODO: implement */
#define tx_pdtch_fnNULL
-#define tx_tchh_fn NULL
-
#define rx_pdtch_fnNULL
-#define rx_tchh_fn NULL
/* Forward declaration of handlers */
int rx_data_fn(struct trx_instance *trx, struct trx_ts *ts,
@@ -54,6 +51,14 @@
int tx_tchf_fn(struct trx_instance *trx, struct trx_ts *ts,
struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);
+int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,
+ sbit_t *bits, int8_t rssi, int16_t toa256);
+
+int tx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid);
+
+
const struct trx_lchan_desc trx_lchan_desc[_TRX_CHAN_MAX] = {
{
TRXC_IDLE, "IDLE",
diff --git a/src/host/trxcon/sched_lchan_tchh.c
b/src/host/trxcon/sched_lchan_tchh.c
new file mode 100644
index 000..678fca8
--- /dev/null
+++ b/src/host/trxcon/sched_lchan_tchh.c
@@ -0,0 +1,316 @@
+/*
+ * OsmocomBB <-> SDR connection bridge
+ * TDMA scheduler: handlers for DL / UL bursts on logical channels
+ *
+ * (C) 2018 by Vadim Yanitskiy
+ * (C) 2018 by Harald Welte
+ *
+ * All Rights Reserved
+ *
+ * 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
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include "l1ctl_proto.h"
+#include "scheduler.h"
+#include "sched_trx.h"
+#include "logging.h"
+#include "trx_if.h"
+#include "trxcon.h"
+#include "l1ctl.h"
+
+int rx_tchh_fn(struct trx_instance *trx, struct trx_ts *ts,
+ struct trx_lchan_state *lchan, uint32_t fn, uint8_t bid,
+ sbit_t *bits, int8_t rssi, int16_t toa256)
+{
+ const struct trx_lchan_desc *lchan_desc;
+ int n_errors = -1, n_bits_total, rc;
+ sbit_t *buffer, *offset;
+ uint8_t l2[128], *mask;
+ uint32_t *first_fn;
+ bool facch_now;
+ size_t l2_len;
+
+ /* Set up pointers */
+ lchan_desc = &trx_lchan_desc[lchan->type];
+ first_fn = &lchan->rx_first_fn;
+ mask = &lchan->rx_burst_mask;
+ buffer = lchan->rx_bursts;
+
+ LOGP(DSCHD, LOGL_DEBUG, "Traffic received on %s: fn=%u ts=%u bid=%u\n",
+ lchan_desc->name, fn, ts->index, bid);
+
+ /* Reset internal state */
+ if (bid == 0) {
+ /* FIXME: clean up old measurements */
+ memset(&lchan->meas, 0x00, sizeof(lchan->meas));
+
+ /* FIXME: clear history buffer: no need? */
+ memset(buffer + 464, 0, 232);
+
+ *first_fn = fn;
+ *mask = 0x00;
+ }
+
+ /* Update mask */
+ *mask |= (1 << bid);
+
+ /* Update mask and RSSI */
+ lchan->meas.rssi_sum += rssi;
+ lchan->meas.toa256_sum += toa256;
+ lchan->meas.rssi_num++;
+ lchan->meas.toa256_num++;
+
+ /* Copy burst to the end of buffer of 6 bursts */
+ offset = buffer + bid * 116 + 464;
+ memcpy(offset, bits + 3, 58);
+ memcpy(offset + 58, bits + 87, 58
