dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_*
Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c
This commit is contained in:
parent
4673b86f3d
commit
9518ffc299
|
@ -1494,6 +1494,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb,
|
||||||
switch (chan_comb) {
|
switch (chan_comb) {
|
||||||
case NM_CHANC_TCHHalf:
|
case NM_CHANC_TCHHalf:
|
||||||
case NM_CHANC_TCHHalf2:
|
case NM_CHANC_TCHHalf2:
|
||||||
|
case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
|
||||||
/* not supported */
|
/* not supported */
|
||||||
*reason = "TCH/H is not supported.";
|
*reason = "TCH/H is not supported.";
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
@ -1590,6 +1591,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb,
|
||||||
case NM_CHANC_TCHHalf:
|
case NM_CHANC_TCHHalf:
|
||||||
case NM_CHANC_IPAC_TCHFull_TCHHalf:
|
case NM_CHANC_IPAC_TCHFull_TCHHalf:
|
||||||
case NM_CHANC_IPAC_TCHFull_PDCH:
|
case NM_CHANC_IPAC_TCHFull_PDCH:
|
||||||
|
case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
|
||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
*reason = "TS1 must carry a CBCH, SDCCH or TCH.";
|
*reason = "TS1 must carry a CBCH, SDCCH or TCH.";
|
||||||
|
@ -1621,6 +1623,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb,
|
||||||
return 0;
|
return 0;
|
||||||
case NM_CHANC_IPAC_PDCH:
|
case NM_CHANC_IPAC_PDCH:
|
||||||
case NM_CHANC_IPAC_TCHFull_PDCH:
|
case NM_CHANC_IPAC_TCHFull_PDCH:
|
||||||
|
case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH:
|
||||||
if (ts->trx->nr == 0)
|
if (ts->trx->nr == 0)
|
||||||
return 0;
|
return 0;
|
||||||
else {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue