fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/35289?usp=email ) Change subject: gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr() ...................................................................... gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr() Change-Id: Ic9370d8d7f13cce0f9c6e60a920d04161a7d6844 --- M src/osmo-bsc/gsm_data.c 1 file changed, 16 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/89/35289/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 4d77e75..b11607e 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -460,22 +460,20 @@ if (vamos_is_secondary) cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs; else - cbits = 0x01; + cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs; break; case GSM_PCHAN_PDCH: if (lchan_nr != 0) return -EINVAL; - cbits = RSL_CHAN_OSMO_PDCH >> 3; + cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH; break; case GSM_PCHAN_TCH_H: if (lchan_nr >= 2) return -EINVAL; if (vamos_is_secondary) cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr); - else { - cbits = 0x02; - cbits += lchan_nr; - } + else + cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr); break; case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4_CBCH: @@ -488,21 +486,19 @@ lchan_nr = 0; else if (lchan_nr > 4) return -EINVAL; - cbits = 0x04; - cbits += lchan_nr; + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr); break; case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: if (lchan_nr >= 8) return -EINVAL; - cbits = 0x08; - cbits += lchan_nr; + cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr); break; default: case GSM_PCHAN_CCCH: if (lchan_nr != 0) return -EINVAL; - cbits = 0x10; + cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH; break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/35289?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic9370d8d7f13cce0f9c6e60a920d04161a7d6844 Gerrit-Change-Number: 35289 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange