Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres

2018-09-15 Thread Harald Welte
Harald Welte has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/10459 )

Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres
..

trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres

Unlike xCCH, TCH/H channels are using block diagonal interleaving,
so every single burst carries 57 bits of one traffic frame, and 57
bits of another one. Moreover, unlike TCH/F where both traffic
and FACCH/F frames are interleaved over 8 bursts, a FACCH/H is
interleaved over 6 bursts, while a traffic frame is interleaved
over 4 bursts.

This is why a TCH/H burst transmission can't be initiated on
an arbitrary TDMA frame number. It shall be aligned as of
stated in GSM 05.02, clause 7, table 1.

This change introduces two basic functions:

  - sched_tchh_block_map_fn - checks if a TCH/H block transmission
can be initiated / finished on a given frame number
and a given channel type;

  - sched_tchh_block_dl_first_fn - calculates TDMA frame number of
the first burst using given frame number of the last burst;

and some auxiliary wrappers to simplify the usage of
sched_tchh_block_map_fn().

Change-Id: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9
---
M src/host/trxcon/Makefile.am
A src/host/trxcon/sched_lchan_tchh.c
M src/host/trxcon/sched_prim.c
M src/host/trxcon/sched_trx.h
M src/host/trxcon/scheduler.h
5 files changed, 207 insertions(+), 16 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



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_tchh.c 
b/src/host/trxcon/sched_lchan_tchh.c
new file mode 100644
index 000..316f995
--- /dev/null
+++ b/src/host/trxcon/sched_lchan_tchh.c
@@ -0,0 +1,183 @@
+/*
+ * OsmocomBB <-> SDR connection bridge
+ * TDMA scheduler: handlers for DL / UL bursts on logical channels
+ *
+ * (C) 2018 by Vadim Yanitskiy 
+ *
+ * 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 "scheduler.h"
+#include "sched_trx.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) */
+   { 0, 2, 4, 6 },
+   { 4, 6, 8, 10 },
+   { 8, 10, 0, 2 },
+};
+
+static const uint8_t tch_h1_traffic_block_map[3][4] = {
+   /* B0(1,3,5,7), B1(5,7,9,11), B2(9,11,1,3) */
+   { 1, 3, 5, 7 },
+   { 5, 7, 9, 11 },
+   { 9, 11, 1, 3 },
+};
+
+static const uint8_t tch_h0_dl_facch_block_map[3][6] = {
+   /* B0(4,6,8,10,13,15), B1(13,15,17,19,21,23), B2(21,23,0,2,4,6) */
+   { 4, 6, 8, 10, 13, 15 },
+   { 13, 15, 17, 19, 21, 23 },
+   { 21, 23, 0, 2, 4, 6 },
+};
+
+static const uint8_t tch_h0_ul_facch_block_map[3][6] = {
+   /* B0(0,2,4,6,8,10), B1(8,10,13,15,17,19), B2(17,19,21,23,0,2) */
+   { 0, 2, 4, 6, 8, 10 },
+   { 8, 10, 13, 15, 17, 19 },
+   { 17, 19, 21, 23, 0, 2 },
+};
+
+static const uint8_t tch_h1_dl_facch_block_map[3][6] = {
+   /* B0(5,7,9,11,14,16), B1(14,16,18,20,22,24), B2(22,24,1,3,5,7) */
+   { 5, 7, 9, 11, 14, 16 },
+   { 14, 16, 18, 20, 22, 24 },
+   { 22, 24, 1, 3, 5, 7 },
+};
+
+const uint8_t tch_h1_ul_facch_block_map[3][6] = {
+   /* B0(1,3,5,7,9,11), B1(9,11,14,16,18,20), B2(18,20,22,24,1,3) */
+   { 1, 3, 5, 7, 9, 11 },
+   { 9, 11, 14, 16, 18, 20 },
+   { 18, 20, 22, 24, 1, 3 },
+};
+
+/**
+ * Can a TCH/H block transmission be initiated / finished
+ * on a given frame number and a given channel type?
+ *
+ * See GSM 05.02, clause 7, table 1
+ *
+ * @param  chan   channel type (TRXC_TCHH_0 or TRXC_TCHH_1)
+ * @param  fn the current frame number
+ * @param  ul Uplink or Downlink?
+ * @param  facch  FACCH/H or traffic?
+ * @param  start  init or end of transmission?
+ * @returntrue (yes) or false (no)
+ */
+bool sched_tchh_block_map_fn(enum trx_lchan_type chan,
+

Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres

2018-09-15 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/10459 )

Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres
..


Patch Set 3: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/10459
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: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9
Gerrit-Change-Number: 10459
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:48:08 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes


Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres

2018-09-15 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10459 )

Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/10459
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: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9
Gerrit-Change-Number: 10459
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:18 +
Gerrit-HasComments: No
Gerrit-HasLabels: No


Change in osmocom-bb[master]: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres

2018-09-15 Thread Vadim Yanitskiy
Vadim Yanitskiy has posted comments on this change. ( 
https://gerrit.osmocom.org/10459 )

Change subject: trxcon/scheduler: introduce TCH/H TDMA frame mapping helpres
..


Set Ready For Review


--
To view, visit https://gerrit.osmocom.org/10459
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: Iaf4cb33f1b79df23f8a90c8b14ebe0cd9907fbb9
Gerrit-Change-Number: 10459
Gerrit-PatchSet: 2
Gerrit-Owner: Vadim Yanitskiy 
Gerrit-Reviewer: Harald Welte 
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Vadim Yanitskiy 
Gerrit-Comment-Date: Sat, 15 Sep 2018 18:54:02 +
Gerrit-HasComments: No
Gerrit-HasLabels: No