Review at https://gerrit.osmocom.org/181
dyn PDCH: Automatically deactivate/activate PDCH on TCH/F+PDCH channel
Handle shared TCH/F+PDCH channels as regular TCH/F channels. Prior to
activation, deactivate PDCH mode.
After deactivation, restore PDCH mode.
Change-Id: I5b7cff07ad9ac281a212daff8106a7d65c3c3145
---
M openbsc/include/openbsc/gsm_data_shared.h
M openbsc/src/libbsc/abis_rsl.c
M openbsc/src/libbsc/bsc_init.c
3 files changed, 45 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/81/181/1
diff --git a/openbsc/include/openbsc/gsm_data_shared.h
b/openbsc/include/openbsc/gsm_data_shared.h
index c3d5978..7f9b0cc 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -256,6 +256,12 @@
struct gsm48_req_ref *rqd_ref;
struct gsm_subscriber_connection *conn;
+
+ struct {
+ /* channel activation type and handover ref */
+ uint8_t act_type;
+ uint8_t ho_ref;
+ } dyn_pdch;
#else
/* Number of different GsmL1_Sapi_t used in osmo_bts_sysmo is 23.
* Currently we don't share these headers so this is a magic number. */
diff --git a/openbsc/src/libbsc/abis_rsl.c b/openbsc/src/libbsc/abis_rsl.c
index abe2f9b..59176df 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -470,6 +470,15 @@
if (rc < 0)
return rc;
+ /* if channel is in PDCH mode, deactivate PDCH first */
+ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
+ && (lchan->ts->flags & TS_F_PDCH_MODE)) {
+ /* store activation type and handover reference */
+ lchan->dyn_pdch.act_type = act_type;
+ lchan->dyn_pdch.ho_ref = ho_ref;
+ return rsl_ipacc_pdch_activate(lchan->ts, 0);
+ }
+
ta = lchan->rqd_ta;
/* BS11 requires TA shifted by 2 bits */
@@ -746,6 +755,11 @@
LOGP(DRSL, LOGL_NOTICE, "%s CHAN REL ACK but state %s\n",
gsm_lchan_name(lchan),
gsm_lchans_name(lchan->state));
+
+ /* Put PDCH channel back into PDCH mode first */
+ if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH)
+ return rsl_ipacc_pdch_activate(lchan->ts, 1);
+
do_lchan_free(lchan);
return 0;
@@ -1187,6 +1201,26 @@
return 0;
}
+static int rsl_rx_pdch_act_ack(struct msgb *msg)
+{
+ msg->lchan->ts->flags |= TS_F_PDCH_MODE;
+
+ /* We have activated PDCH, so now the channel is available again. */
+ do_lchan_free(msg->lchan);
+
+ return 0;
+}
+
+static int rsl_rx_pdch_deact_ack(struct msgb *msg)
+{
+ msg->lchan->ts->flags &= ~TS_F_PDCH_MODE;
+
+ rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn_pdch.act_type,
+ msg->lchan->dyn_pdch.ho_ref);
+
+ return 0;
+}
+
static int abis_rsl_rx_dchan(struct msgb *msg)
{
struct abis_rsl_dchan_hdr *rslh = msgb_l2(msg);
@@ -1225,14 +1259,14 @@
break;
case RSL_MT_IPAC_PDCH_ACT_ACK:
DEBUGP(DRSL, "%s IPAC PDCH ACT ACK\n", ts_name);
- msg->lchan->ts->flags |= TS_F_PDCH_MODE;
+ rc = rsl_rx_pdch_act_ack(msg);
break;
case RSL_MT_IPAC_PDCH_ACT_NACK:
LOGP(DRSL, LOGL_ERROR, "%s IPAC PDCH ACT NACK\n", ts_name);
break;
case RSL_MT_IPAC_PDCH_DEACT_ACK:
DEBUGP(DRSL, "%s IPAC PDCH DEACT ACK\n", ts_name);
- msg->lchan->ts->flags &= ~TS_F_PDCH_MODE;
+ rc = rsl_rx_pdch_deact_ack(msg);
break;
case RSL_MT_IPAC_PDCH_DEACT_NACK:
LOGP(DRSL, LOGL_ERROR, "%s IPAC PDCH DEACT NACK\n", ts_name);
diff --git a/openbsc/src/libbsc/bsc_init.c b/openbsc/src/libbsc/bsc_init.c
index 1012425..110e160 100644
--- a/openbsc/src/libbsc/bsc_init.c
+++ b/openbsc/src/libbsc/bsc_init.c
@@ -328,8 +328,10 @@
generate_cell_chan_list(ca, trx->bts);
llist_for_each_entry(cur_trx, &trx->bts->trx_list,
list) {
- for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++)
+ for (i = 0; i < ARRAY_SIZE(cur_trx->ts); i++) {
generate_ma_for_ts(&cur_trx->ts[i]);
+ cur_trx->ts[i].flags |= TS_F_PDCH_MODE;
+ }
}
}
if (isd->link_type == E1INP_SIGN_RSL)
--
To view, visit https://gerrit.osmocom.org/181
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b7cff07ad9ac281a212daff8106a7d65c3c3145
Gerrit-PatchSet: 1
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <[email protected]>
