cellular-infrastructure
/
osmo-bsc
mirror of https://gerrit.osmocom.org/osmo-bsc
9
0
Fork 0
Code Issues Releases Wiki Activity

gsm_data: use ABIS_RSL_CHAN_NR_CBITS_* in gsm_pchan2chan_nr() 

Change-Id: Ic9370d8d7f13cce0f9c6e60a920d04161a7d6844
This commit is contained in:
Vadim Yanitskiy 2023-12-09 01:46:12 +07:00
parent 2376b52da2
commit 510a868168
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/osmo-bsc/gsm_data.c
View File

@ -460,22 +460,20 @@ int gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
if (vamos_is_secondary) if (vamos_is_secondary)
cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs; cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Bm_ACCHs;
else else
cbits = 0x01; cbits = ABIS_RSL_CHAN_NR_CBITS_Bm_ACCHs;
break; break;
case GSM_PCHAN_PDCH: case GSM_PCHAN_PDCH:
if (lchan_nr != 0) if (lchan_nr != 0)
return -EINVAL; return -EINVAL;
cbits = RSL_CHAN_OSMO_PDCH >> 3; cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_PDCH;
break; break;
case GSM_PCHAN_TCH_H: case GSM_PCHAN_TCH_H:
if (lchan_nr >= 2) if (lchan_nr >= 2)
return -EINVAL; return -EINVAL;
if (vamos_is_secondary) if (vamos_is_secondary)
cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr); cbits = ABIS_RSL_CHAN_NR_CBITS_OSMO_VAMOS_Lm_ACCHs(lchan_nr);
else { else
cbits = 0x02; cbits = ABIS_RSL_CHAN_NR_CBITS_Lm_ACCHs(lchan_nr);
cbits += lchan_nr;
}
break; break;
case GSM_PCHAN_CCCH_SDCCH4: case GSM_PCHAN_CCCH_SDCCH4:
case GSM_PCHAN_CCCH_SDCCH4_CBCH: case GSM_PCHAN_CCCH_SDCCH4_CBCH:
@ -488,21 +486,19 @@ int gsm_pchan2chan_nr(enum gsm_phys_chan_config pchan,
lchan_nr = 0; lchan_nr = 0;
else if (lchan_nr > 4) else if (lchan_nr > 4)
return -EINVAL; return -EINVAL;
cbits = 0x04; cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH4_ACCH(lchan_nr);
cbits += lchan_nr;
break; break;
case GSM_PCHAN_SDCCH8_SACCH8C: case GSM_PCHAN_SDCCH8_SACCH8C:
case GSM_PCHAN_SDCCH8_SACCH8C_CBCH: case GSM_PCHAN_SDCCH8_SACCH8C_CBCH:
if (lchan_nr >= 8) if (lchan_nr >= 8)
return -EINVAL; return -EINVAL;
cbits = 0x08; cbits = ABIS_RSL_CHAN_NR_CBITS_SDCCH8_ACCH(lchan_nr);
cbits += lchan_nr;
break; break;
default: default:
case GSM_PCHAN_CCCH: case GSM_PCHAN_CCCH:
if (lchan_nr != 0) if (lchan_nr != 0)
return -EINVAL; return -EINVAL;
cbits = 0x10; cbits = ABIS_RSL_CHAN_NR_CBITS_BCCH;
break; break;
} }