diff options
| author | Philipp Maier <pmaier@sysmocom.de> | 2018-02-21 16:58:08 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-02-22 07:58:26 +0000 |
| commit | a4bca115557feb0268e6cfda30238ded16328ae6 (patch) | |
| tree | 48fa63300f099eab9ce11263558de5ecef876165 /src/osmo-bts-sysmo/main.c | |
| parent | b93748a1707fa4e20c3a8c3a241dd9e3fb03ea87 (diff) | |
bts: use feature list instead of speech codec table
osmo-bts has a table of pchan/channel mode combinations for every
bts. This table models the codec capabilitys of the BTS hardware.
However, having the speech codec apabilities modeled inside the
BTS feature list would be much more comfortable and since the
feature list is communicated back to the BSC we would get the
codec capabilities inside the BSC domain as well.
- remove the pchan/channel mode tables
- set speech codec variants for each BTS type
- fix bts_supports_cm so that it queries the feature list
Change-Id: I977dc729ba856631245aedf76afd48eac92166f7
Diffstat (limited to 'src/osmo-bts-sysmo/main.c')
| -rw-r--r-- | src/osmo-bts-sysmo/main.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c index 6118b605..efcf4a8d 100644 --- a/src/osmo-bts-sysmo/main.c +++ b/src/osmo-bts-sysmo/main.c @@ -55,17 +55,6 @@ #include "hw_misc.h" #include "oml_router.h" -/* Table with channel rate / and codec configuration that are supported - * by the hardware bts_supports_cm() */ -static const struct bts_cm bts_model_supported_cm[] = { - { GSM_PCHAN_TCH_F, GSM48_CMODE_SPEECH_V1}, - { GSM_PCHAN_TCH_H, GSM48_CMODE_SPEECH_V1}, - { GSM_PCHAN_TCH_F, GSM48_CMODE_SPEECH_EFR}, - { GSM_PCHAN_TCH_F, GSM48_CMODE_SPEECH_AMR}, - { GSM_PCHAN_TCH_H, GSM48_CMODE_SPEECH_AMR}, - { _GSM_PCHAN_MAX, 0 } -}; - int bts_model_init(struct gsm_bts *bts) { struct gsm_bts_role_bts *btsb; @@ -76,7 +65,6 @@ int bts_model_init(struct gsm_bts *bts) bts->variant = BTS_OSMO_SYSMO; btsb = bts_role_bts(bts); btsb->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3); - btsb->support.cm = bts_model_supported_cm; rc = oml_router_init(bts, OML_ROUTER_PATH, &accept_fd, &read_fd); if (rc < 0) { |