diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-16 22:29:28 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2016-07-25 16:38:18 +0200 |
| commit | 334df9441a44de00c0dd3f66e73ac6fae28098fb (patch) | |
| tree | a1c1d07121510f421610a9fe3f21b86a230eb542 /src/common/l1sap.c | |
| parent | 290c7d954faa9410c4c6740787e8e3bbf1c92d6c (diff) | |
cosmetic: clarify TCH/F_PDCH related naming and comments
We're about to introduce a new kind of dynamic channel, which will also use
parts of the ip.access mode dyn PDCH code paths. Make sure the general parts
have general names and mark ip.access specific parts as such.
Rename dyn_pdch_ts_[dis]connected() to cb_ts_[dis]connected().
Rename dyn_pdch_complete to ipacc_dyn_pdch_complete().
From cb_ts_[dis]connected(), factor out the current code into static
functions ipacc_dyn_pdch_[dis]connected() -- this will make sense once the
new dynamic kind is added to cb_ts_[dis]connected().
Change-Id: I7da5b7cb7b48572671f50e0dec97d9eec3083df1
Diffstat (limited to 'src/common/l1sap.c')
| -rw-r--r-- | src/common/l1sap.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/common/l1sap.c b/src/common/l1sap.c index d73715b1..23bc66e8 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -463,8 +463,10 @@ static int l1sap_info_act_cnf(struct gsm_bts_trx *trx, /* During PDCH ACT, this is where we know that the PCU is done * activating a PDCH, and PDCH switchover is complete. See * rsl_rx_dyn_pdch() */ - if (lchan->ts->flags & TS_F_PDCH_ACT_PENDING) - dyn_pdch_complete(lchan->ts, info_act_cnf->cause? -EIO : 0); + if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH + && (lchan->ts->flags & TS_F_PDCH_ACT_PENDING)) + ipacc_dyn_pdch_complete(lchan->ts, + info_act_cnf->cause? -EIO : 0); return 0; } @@ -486,7 +488,8 @@ static int l1sap_info_rel_cnf(struct gsm_bts_trx *trx, /* During PDCH DEACT, this marks the deactivation of the PDTCH as * requested by the PCU. Next up, we disconnect the TS completely and * call back to dyn_pdch_ts_disconnected(). See rsl_rx_dyn_pdch(). */ - if (lchan->ts->flags & TS_F_PDCH_DEACT_PENDING) + if (lchan->ts->pchan == GSM_PCHAN_TCH_F_PDCH + && (lchan->ts->flags & TS_F_PDCH_DEACT_PENDING)) bts_model_ts_disconnect(lchan->ts); return 0; |