jolly has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/33833 )
Change subject: ASCI: Enable UPLINK ACCESS on various BTS models
......................................................................
ASCI: Enable UPLINK ACCESS on various BTS models
UPLINK ACCESS (RACH on TCH) was enabled for osmo-bts-sysmo only. Now it
is also enabled for:
* osmo-bts-lc15
* osmo-bts-oc2g
* osmo-bts-trx
* osmo-bts-virtual
Change-Id: Iae0db6bfcf6629c114436a79648e832c82835abe
---
M src/osmo-bts-lc15/oml.c
M src/osmo-bts-oc2g/oml.c
M src/osmo-bts-trx/l1_if.c
M src/osmo-bts-virtual/l1_if.c
4 files changed, 24 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/33/33833/1
diff --git a/src/osmo-bts-lc15/oml.c b/src/osmo-bts-lc15/oml.c
index f6abc1b..892afd5 100644
--- a/src/osmo-bts-lc15/oml.c
+++ b/src/osmo-bts-lc15/oml.c
@@ -1164,7 +1164,7 @@
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
* SACCH should be activated. Also, for HO, start the RACH SAPI. */
- if (lchan->ho.active == HANDOVER_ENABLED)
+ if (lchan->ho.active == HANDOVER_ENABLED ||
rsl_chan_rt_is_asci(lchan->rsl_chan_rt))
enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach,
GsmL1_Dir_RxUplink);
for (i = 0; i < s4l->num_sapis; i++) {
diff --git a/src/osmo-bts-oc2g/oml.c b/src/osmo-bts-oc2g/oml.c
index efa41aa..7117dfe 100644
--- a/src/osmo-bts-oc2g/oml.c
+++ b/src/osmo-bts-oc2g/oml.c
@@ -1179,7 +1179,7 @@
/* For handover, always start the main channel immediately.
lchan->want_dl_sacch_active indicates whether dl
* SACCH should be activated. Also, for HO, start the RACH SAPI. */
- if (lchan->ho.active == HANDOVER_ENABLED)
+ if (lchan->ho.active == HANDOVER_ENABLED ||
rsl_chan_rt_is_asci(lchan->rsl_chan_rt))
enqueue_sapi_act_cmd(lchan, GsmL1_Sapi_Rach,
GsmL1_Dir_RxUplink);
for (i = 0; i < s4l->num_sapis; i++) {
diff --git a/src/osmo-bts-trx/l1_if.c b/src/osmo-bts-trx/l1_if.c
index 60f9232..a1329a8 100644
--- a/src/osmo-bts-trx/l1_if.c
+++ b/src/osmo-bts-trx/l1_if.c
@@ -45,6 +45,7 @@
#include <osmo-bts/scheduler.h>
#include <osmo-bts/pcu_if.h>
#include <osmo-bts/nm_common_fsm.h>
+#include <osmo-bts/handover.h>
#include "l1_if.h"
#include "trx_if.h"
@@ -452,7 +453,8 @@
lchan->tch.amr_mr.mode[2].mode,
lchan->tch.amr_mr.mode[3].mode,
amr_get_initial_mode(lchan),
- (lchan->ho.active == 1));
+ (lchan->ho.active ==
HANDOVER_ENABLED) ||
+
rsl_chan_rt_is_asci(lchan->rsl_chan_rt));
/* set lchan active */
lchan_set_state(lchan, LCHAN_S_ACTIVE);
/* set initial ciphering */
diff --git a/src/osmo-bts-virtual/l1_if.c b/src/osmo-bts-virtual/l1_if.c
index 6410d9d..2408557 100644
--- a/src/osmo-bts-virtual/l1_if.c
+++ b/src/osmo-bts-virtual/l1_if.c
@@ -42,6 +42,7 @@
#include <osmo-bts/amr.h>
#include <osmo-bts/abis.h>
#include <osmo-bts/scheduler.h>
+#include <osmo-bts/handover.h>
#include "virtual_um.h"
extern int vbts_sched_start(struct gsm_bts *bts);
@@ -383,7 +384,8 @@
lchan->tch.amr_mr.mode[2].mode,
lchan->tch.amr_mr.mode[3].mode,
amr_get_initial_mode(lchan),
- (lchan->ho.active == 1));
+ (lchan->ho.active ==
HANDOVER_ENABLED ||
+
rsl_chan_rt_is_asci(lchan->rsl_chan_rt)));
/* set lchan active */
lchan_set_state(lchan, LCHAN_S_ACTIVE);
/* set initial ciphering */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33833
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Iae0db6bfcf6629c114436a79648e832c82835abe
Gerrit-Change-Number: 33833
Gerrit-PatchSet: 1
Gerrit-Owner: jolly <[email protected]>
Gerrit-MessageType: newchange
