From 9518ffc299e3dd3fd5ff854af047e4d88815dd8b Mon Sep 17 00:00:00 2001 From: Neels Hofmeyr Date: Thu, 14 Jul 2016 03:09:56 +0200 Subject: [PATCH] dyn TS: verify_chan_comb(): handle new dyn TS NM_CHANC_* Change-Id: I7ce754a48c7f492e921a4450745383bb8dd7225c --- openbsc/src/libbsc/abis_nm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openbsc/src/libbsc/abis_nm.c b/openbsc/src/libbsc/abis_nm.c index 3afc4c497..3289b3c52 100644 --- a/openbsc/src/libbsc/abis_nm.c +++ b/openbsc/src/libbsc/abis_nm.c @@ -1494,6 +1494,7 @@ static int verify_chan_comb(struct gsm_bts_trx_ts *ts, uint8_t chan_comb, switch (chan_comb) { case NM_CHANC_TCHHalf: case NM_CHANC_TCHHalf2: + case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH: /* not supported */ *reason = "TCH/H is not supported."; 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_IPAC_TCHFull_TCHHalf: case NM_CHANC_IPAC_TCHFull_PDCH: + case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH: return 0; default: *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; case NM_CHANC_IPAC_PDCH: case NM_CHANC_IPAC_TCHFull_PDCH: + case NM_CHANC_OSMO_TCHFull_TCHHalf_PDCH: if (ts->trx->nr == 0) return 0; else {