fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34033 )
Change subject: rsl: rsl_handle_chan_mod_ie(): do not use legacy defines ......................................................................
rsl: rsl_handle_chan_mod_ie(): do not use legacy defines
Change-Id: I4e8f9ff5189af80bce13cfd1b27585aabda03f7a Related: OS#1572 --- M src/common/rsl.c 1 file changed, 17 insertions(+), 7 deletions(-)
Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified
diff --git a/src/common/rsl.c b/src/common/rsl.c index 9c0bce0..b37dd43 100644 --- a/src/common/rsl.c +++ b/src/common/rsl.c @@ -239,37 +239,37 @@ break;
/* If octet 4 indicates transparent data */ - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_32000): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_32k0): /* 32.0 kbit/s services, 32.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_32k0; lchan->csd_mode = LCHAN_CSD_M_T_32000; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_29000): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_29k0): /* 29.0 kbit/s services, 29.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_29k0; lchan->csd_mode = LCHAN_CSD_M_T_29000; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_14400): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_14k4): /* 14.4 kbit/s services, 14.5 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_14k5; lchan->csd_mode = LCHAN_CSD_M_T_14400; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_9600): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_9k6): /* 9.6 kbit/s services, 12.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_12k0; lchan->csd_mode = LCHAN_CSD_M_T_9600; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_4800): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_4k8): /* 4.8 kbit/s services, 6.0 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_6k0; lchan->csd_mode = LCHAN_CSD_M_T_4800; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_2400): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_2k4): /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_3k6; lchan->csd_mode = LCHAN_CSD_M_T_2400; break; - case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1200): + case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_T_1k2): /* 2.4 kbit/s *and less* services, 3.6 kbit/s radio interface rate */ lchan->tch_mode = GSM48_CMODE_DATA_3k6; lchan->csd_mode = LCHAN_CSD_M_T_1200;