diff options
author | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2015-09-12 20:03:36 -0400 |
---|---|---|
committer | Alexander Chemeris <Alexander.Chemeris@gmail.com> | 2015-09-12 20:05:55 -0400 |
commit | 8975ce335bf2d5a41767ad2bb33ab9463e35078b (patch) | |
tree | abad0bf4858afe122f0f2c0a461afb96a97a0407 | |
parent | bb3bf59fbf3263df1f27c6b5cf168dcfab190610 (diff) |
debian: Revert parts of gsm_data_shared.h which break OsmoBTS code.201509-fairwaves-rebase
-rw-r--r-- | include/openbsc/gsm_data_shared.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/openbsc/gsm_data_shared.h b/include/openbsc/gsm_data_shared.h index 86bf557a..bf7f98b1 100644 --- a/include/openbsc/gsm_data_shared.h +++ b/include/openbsc/gsm_data_shared.h @@ -150,8 +150,10 @@ struct bts_codec_conf { struct amr_mode { uint8_t mode; - uint8_t threshold; - uint8_t hysteresis; + uint8_t threshold_ms; + uint8_t hysteresis_ms; + uint8_t threshold_bts; + uint8_t hysteresis_bts; }; struct amr_multirate_conf { uint8_t gsm48_ie[2]; @@ -207,7 +209,8 @@ struct gsm_lchan { } encr; /* AMR bits */ - struct gsm48_multi_rate_conf mr_conf; + uint8_t mr_ms_lv[7]; + uint8_t mr_bts_lv[7]; /* Established data link layer services */ uint8_t sapis[8]; |