Change in osmo-bts[master]: CBCH: Some more scheduler_mframe cleanup

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11006 )

Change subject: CBCH: Some more scheduler_mframe cleanup
......................................................................

CBCH: Some more scheduler_mframe cleanup

As the CBCH replaces SDCCH sub-slot-2 in downlink, we should mark
the uplink as IDLE, just as the associated SACCH in uplink and downlink.

Also, there are no burst_numbers in IDLE slots.

Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c
---
M src/common/scheduler_mframe.c
1 file changed, 14 insertions(+), 14 deletions(-)

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



diff --git a/src/common/scheduler_mframe.c b/src/common/scheduler_mframe.c
index b78ffa8..b969407 100644
--- a/src/common/scheduler_mframe.c
+++ b/src/common/scheduler_mframe.c
@@ -179,9 +179,9 @@
       { TRXC_BCCH,	2,	TRXC_RACH,	0 },
       { TRXC_BCCH,	3,	TRXC_RACH,	0 },
       { TRXC_CCCH,	0,	TRXC_IDLE,	0 },
-      { TRXC_CCCH,	1,	TRXC_IDLE,	1 },
-      { TRXC_CCCH,	2,	TRXC_IDLE,	2 },
-      { TRXC_CCCH,	3,	TRXC_IDLE,	3 },
+      { TRXC_CCCH,	1,	TRXC_IDLE,	0 },
+      { TRXC_CCCH,	2,	TRXC_IDLE,	0 },
+      { TRXC_CCCH,	3,	TRXC_IDLE,	0 },
       {	TRXC_FCCH,	0,	TRXC_SACCH4_3,	0 },
       {	TRXC_SCH,	0,	TRXC_SACCH4_3,	1 },
       { TRXC_CCCH,	0,	TRXC_SACCH4_3,	2 },
@@ -219,10 +219,10 @@
       { TRXC_SACCH4_0,	2,	TRXC_SDCCH4_1,	3 },
       { TRXC_SACCH4_0,	3,	TRXC_RACH,	0 },
       { TRXC_SACCH4_1,	0,	TRXC_RACH,	0 },
-      { TRXC_SACCH4_1,	1,	TRXC_RACH,	0 },
-      { TRXC_SACCH4_1,	2,	TRXC_RACH,	1 },
-      { TRXC_SACCH4_1,	3,	TRXC_RACH,	2 },
-      {	TRXC_IDLE,	0,	TRXC_RACH,	3 },
+      { TRXC_SACCH4_1,	1,	TRXC_IDLE,	0 },
+      { TRXC_SACCH4_1,	2,	TRXC_IDLE,	0 },
+      { TRXC_SACCH4_1,	3,	TRXC_IDLE,	0 },
+      {	TRXC_IDLE,	0,	TRXC_IDLE,	0 },
 
       {	TRXC_FCCH,	0,	TRXC_SDCCH4_3,	0 },
       {	TRXC_SCH,	0,	TRXC_SDCCH4_3,	1 },
@@ -267,14 +267,14 @@
       {	TRXC_FCCH,	0,	TRXC_SDCCH4_0,	3 },
       {	TRXC_SCH,	0,	TRXC_SDCCH4_1,	0 },
       { TRXC_IDLE,	0,	TRXC_SDCCH4_1,	1 },
-      { TRXC_IDLE,	1,	TRXC_SDCCH4_1,	2 },
-      { TRXC_IDLE,	2,	TRXC_SDCCH4_1,	3 },
-      { TRXC_IDLE,	3,	TRXC_RACH,	0 },
+      { TRXC_IDLE,	0,	TRXC_SDCCH4_1,	2 },
+      { TRXC_IDLE,	0,	TRXC_SDCCH4_1,	3 },
+      { TRXC_IDLE,	0,	TRXC_RACH,	0 },
       { TRXC_SACCH4_3,	0,	TRXC_RACH,	0 },
-      { TRXC_SACCH4_3,	1,	TRXC_RACH,	0 },
-      { TRXC_SACCH4_3,	2,	TRXC_RACH,	1 },
-      { TRXC_SACCH4_3,	3,	TRXC_RACH,	2 },
-      {	TRXC_IDLE,	0,	TRXC_SDCCH4_2,	3 },
+      { TRXC_SACCH4_3,	1,	TRXC_IDLE,	0 },
+      { TRXC_SACCH4_3,	2,	TRXC_IDLE,	0 },
+      { TRXC_SACCH4_3,	3,	TRXC_IDLE,	0 },
+      {	TRXC_IDLE,	0,	TRXC_IDLE,	0 },
 };
 
 static const struct trx_sched_frame frame_sdcch8[102] = {

-- 
To view, visit https://gerrit.osmocom.org/11006
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8565d1d0080bfce5d2aec77609709a445a2171c
Gerrit-Change-Number: 11006
Gerrit-PatchSet: 1
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180918/2168fc8d/attachment.htm>