diff options
author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-01-06 11:44:26 +0100 |
---|---|---|
committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-01-06 11:44:26 +0100 |
commit | 619df61ad27093a4a0305b7af9a8e36719a6d474 (patch) | |
tree | a96c1b2b484d751f184621ca1332ea51ace3d783 | |
parent | 893ea65f381acc877f852e48894f4575904b7cf9 (diff) |
[rsl] Partial revert of the GSM speech mode for the nanoBTS
This is partially reverting 0603c9d9e58b5d29105361a89ab8cb295da29366,
it is true that the ip.access Wireshark dissectors differentiate
TCH/H from TCH/F but in my test I'm unable to send RTP on to the
BTS. It might be that the RTP payload provided in the MDCX is not
the one it will accept with the 0x05 mode. More work needs to be
done to understand this, that is the reason it is comitted to the
on-waves's branch instead of master.
-rw-r--r-- | openbsc/src/abis_rsl.c | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/openbsc/src/abis_rsl.c b/openbsc/src/abis_rsl.c index 053c71258..fcbe8f14c 100644 --- a/openbsc/src/abis_rsl.c +++ b/openbsc/src/abis_rsl.c @@ -1481,31 +1481,11 @@ static u_int8_t ipa_smod_s_for_lchan(struct gsm_lchan *lchan) { switch (lchan->tch_mode) { case GSM48_CMODE_SPEECH_V1: - switch (lchan->type) { - case GSM_LCHAN_TCH_F: - return 0x00; - case GSM_LCHAN_TCH_H: - return 0x03; - default: - break; - } + return 0x00; case GSM48_CMODE_SPEECH_EFR: - switch (lchan->type) { - case GSM_LCHAN_TCH_F: - return 0x01; - /* there's no half-rate EFR */ - default: - break; - } + return 0x01; case GSM48_CMODE_SPEECH_AMR: - switch (lchan->type) { - case GSM_LCHAN_TCH_F: - return 0x02; - case GSM_LCHAN_TCH_H: - return 0x05; - default: - break; - } + return 0x02; default: break; } |