path: root/include
diff options
authorPhilipp Maier <pmaier@sysmocom.de>2018-02-21 16:58:08 +0100
committerHarald Welte <laforge@gnumonks.org>2018-02-22 07:58:26 +0000
commita4bca115557feb0268e6cfda30238ded16328ae6 (patch)
tree48fa63300f099eab9ce11263558de5ecef876165 /include
parentb93748a1707fa4e20c3a8c3a241dd9e3fb03ea87 (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 'include')
2 files changed, 2 insertions, 8 deletions
diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h
index 2f63e37f..4d6e3479 100644
--- a/include/osmo-bts/bts.h
+++ b/include/osmo-bts/bts.h
@@ -45,8 +45,8 @@ struct gsm_time *get_time(struct gsm_bts *bts);
int bts_main(int argc, char **argv);
-int bts_supports_cm(struct gsm_bts_role_bts *bts,
- enum gsm_phys_chan_config pchan, enum gsm48_chan_mode cm);
+int bts_supports_cm(struct gsm_bts *bts, enum gsm_phys_chan_config pchan,
+ enum gsm48_chan_mode cm);
#endif /* _BTS_H */
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h
index 853b4454..4b834b54 100644
--- a/include/osmo-bts/gsm_data.h
+++ b/include/osmo-bts/gsm_data.h
@@ -33,11 +33,6 @@ struct gsm_network {
struct pcu_sock_state *pcu_state;
-struct bts_cm {
- enum gsm_phys_chan_config pchan;
- enum gsm48_chan_mode cm;
/* data structure for BTS related data specific to the BTS role */
struct gsm_bts_role_bts {
struct {
@@ -94,7 +89,6 @@ struct gsm_bts_role_bts {
bool rtp_jitter_adaptive;
struct {
uint8_t ciphers; /* flags A5/1==0x1, A5/2==0x2, A5/3==0x4 */
- const struct bts_cm *cm; /* Table with supp. ch rate/mode combinations */
} support;
struct {
uint8_t tc4_ctr;