fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27723 ) Change subject: osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check ...................................................................... osmo-bts-{trx,virtual}: tx_tchh_fn(): remove FACCH/H alignment check This check is redundant because it's guaranteed in rts_tchh_fn() that FACCH/H is always scheduled at the correct frame offset. Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Related: SYS#5916, OS#5518 --- M src/osmo-bts-trx/sched_lchan_tchh.c M src/osmo-bts-virtual/scheduler_virtbts.c 2 files changed, 0 insertions(+), 16 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/23/27723/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 05e8e7e..c9811da 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -374,14 +374,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, - "Cannot transmit FACCH starting on even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* BURST BYPASS */ /* allocate burst memory, if not already, diff --git a/src/osmo-bts-virtual/scheduler_virtbts.c b/src/osmo-bts-virtual/scheduler_virtbts.c index 9d2adfc..8557638 100644 --- a/src/osmo-bts-virtual/scheduler_virtbts.c +++ b/src/osmo-bts-virtual/scheduler_virtbts.c @@ -449,14 +449,6 @@ /* get TCH and/or FACCH */ tx_tch_common(l1ts, br, &msg_tch, &msg_facch, (((br->fn + 4) % 26) >> 2) & 1); - /* check for FACCH alignment */ - if (msg_facch && ((((br->fn + 4) % 26) >> 2) & 1)) { - LOGL1SB(DL1P, LOGL_ERROR, l1ts, br, "Cannot transmit FACCH starting on " - "even frames, please fix RTS!\n"); - msgb_free(msg_facch); - msg_facch = NULL; - } - /* no message at all */ if (!msg_tch && !msg_facch && !chan_state->dl_ongoing_facch) { LOGL1SB(DL1P, LOGL_INFO, l1ts, br, "has not been served !! No prim\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27723 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f0c26f6007455aa1e3e8b27bc9d173f6b1f8c38 Gerrit-Change-Number: 27723 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange