dyn TS: rename lchan->dyn_pdch to lchan->dyn
This will also be used by the new dynamic TS type, so make the name more
general.
Change-Id: I2451b10519dff3e5cdf503b430574c0984d19000
diff --git a/openbsc/include/openbsc/gsm_data_shared.h b/openbsc/include/openbsc/gsm_data_shared.h
index 7036619..f4da7a7 100644
--- a/openbsc/include/openbsc/gsm_data_shared.h
+++ b/openbsc/include/openbsc/gsm_data_shared.h
@@ -261,7 +261,7 @@
/* channel activation type and handover ref */
uint8_t act_type;
uint8_t ho_ref;
- } dyn_pdch;
+ } dyn;
#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 b75c3f3..664b1a6 100644
--- a/openbsc/src/libbsc/abis_rsl.c
+++ b/openbsc/src/libbsc/abis_rsl.c
@@ -450,8 +450,8 @@
if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH
&& (lchan->ts->flags & TS_F_PDCH_ACTIVE)) {
/* store activation type and handover reference */
- lchan->dyn_pdch.act_type = act_type;
- lchan->dyn_pdch.ho_ref = ho_ref;
+ lchan->dyn.act_type = act_type;
+ lchan->dyn.ho_ref = ho_ref;
return rsl_ipacc_pdch_activate(lchan->ts, 0);
}
@@ -1262,8 +1262,8 @@
msg->lchan->ts->flags &= ~TS_F_PDCH_ACTIVE;
msg->lchan->ts->flags &= ~TS_F_PDCH_DEACT_PENDING;
- rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn_pdch.act_type,
- msg->lchan->dyn_pdch.ho_ref);
+ rsl_chan_activate_lchan(msg->lchan, msg->lchan->dyn.act_type,
+ msg->lchan->dyn.ho_ref);
return 0;
}