diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-04-29 14:51:28 +0200 |
|---|---|---|
| committer | Neels Hofmeyr <neels@hofmeyr.de> | 2021-05-27 17:06:21 +0200 |
| commit | 08e072bae0ed7052eb069ed4b86a5a1f50e45158 (patch) | |
| tree | 1150142dc677a33e038dca1a404b72c1f4d9f8cc /include/osmocom/bsc | |
| parent | 3625c90c22e33aaa6eab3757a387637195108890 (diff) | |
move lchan->csd_mode into channel_mode_and_rate
The GSM48_CMODE_DATA_* rates are completely unused in OsmoBSC anyway,
but there is some code in abis_rsl.c checking its value, and if we were
to start using it that is the place where it should be.
Related: SYS#5315 OS#4940 OS#3787 OS#3833
Change-Id: Ie0e065a5dca5f4a31d5d81e3528a539214a74170
Diffstat (limited to 'include/osmocom/bsc')
| -rw-r--r-- | include/osmocom/bsc/gsm_data.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index ce477928b..04d5e52b2 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -107,10 +107,24 @@ enum channel_rate { enum channel_rate chan_t_to_chan_rate(enum gsm_chan_t chan_t); +enum lchan_csd_mode { + LCHAN_CSD_M_NT, + LCHAN_CSD_M_T_1200_75, + LCHAN_CSD_M_T_600, + LCHAN_CSD_M_T_1200, + LCHAN_CSD_M_T_2400, + LCHAN_CSD_M_T_9600, + LCHAN_CSD_M_T_14400, + LCHAN_CSD_M_T_29000, + LCHAN_CSD_M_T_32000, +}; + struct channel_mode_and_rate { enum gsm48_chan_mode chan_mode; enum channel_rate chan_rate; uint16_t s15_s0; + /* only used for GSM48_CMODE_DATA_* */ + enum lchan_csd_mode csd_mode; }; enum assign_for { @@ -499,18 +513,6 @@ struct amr_multirate_conf { }; /* /BTS ONLY */ -enum lchan_csd_mode { - LCHAN_CSD_M_NT, - LCHAN_CSD_M_T_1200_75, - LCHAN_CSD_M_T_600, - LCHAN_CSD_M_T_1200, - LCHAN_CSD_M_T_2400, - LCHAN_CSD_M_T_9600, - LCHAN_CSD_M_T_14400, - LCHAN_CSD_M_T_29000, - LCHAN_CSD_M_T_32000, -}; - /* State of the SAPIs in the lchan */ enum lchan_sapi_state { LCHAN_SAPI_S_NONE, @@ -667,8 +669,6 @@ struct gsm_lchan { /* The logical channel type */ enum gsm_chan_t type; - /* RSL channel mode */ - enum lchan_csd_mode csd_mode; /* Power levels for MS and BTS */ uint8_t bs_power; uint8_t ms_power; |