Change in osmo-bts[master]: rsl: add missing Channel Mode values to rsl_handle_chan_mod_ie()

fixeria gerrit-no-reply at lists.osmocom.org
Mon Apr 19 14:34:36 UTC 2021


fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/23792 )

Change subject: rsl: add missing Channel Mode values to rsl_handle_chan_mod_ie()
......................................................................

rsl: add missing Channel Mode values to rsl_handle_chan_mod_ie()

Change-Id: I125cdaaf5adac0891a964c9834b99eb5a35ce262
Depends-On: I40eca759380c8895d7923b2b4259d37a50978160
Depends-On: Icf4c83fa443b8410f4362c119b0a85419036b9cd
---
M src/common/rsl.c
1 file changed, 16 insertions(+), 2 deletions(-)

Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  fixeria: Looks good to me, approved



diff --git a/src/common/rsl.c b/src/common/rsl.c
index 6884712..963e6ba 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -164,7 +164,15 @@
 	case RSL_CMODE(RSL_CMOD_SPD_SPEECH, RSL_CMOD_SP_GSM3):
 		lchan->tch_mode = GSM48_CMODE_SPEECH_AMR;
 		break;
-	/* TODO: also handle RSL_CMOD_SP_{GSM4,GSM5,GSM6} */
+	case RSL_CMODE(RSL_CMOD_SPD_SPEECH, RSL_CMOD_SP_GSM4):
+	case RSL_CMODE(RSL_CMOD_SPD_SPEECH, RSL_CMOD_SP_GSM5):
+	case RSL_CMODE(RSL_CMOD_SPD_SPEECH, RSL_CMOD_SP_GSM6):
+		/* TODO: also handle RSL_CMOD_SP_{GSM4,GSM5,GSM6} */
+		LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel Mode IE contains "
+			  "unhandled speech coding algorithm 0x%02x\n",
+			  cm->chan_rate);
+		*cause = RSL_ERR_IE_CONTENT;
+		return -ENOTSUP;
 
 	/* If octet 4 indicates non-transparent data */
 	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NT_14k5):
@@ -178,7 +186,13 @@
 		break;
 	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NT_43k5):
 	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NT_28k8):
-	/* TODO: also handle non-transparent asymmetric data rates */
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_43k5_14k5):
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_29k0_14k5):
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_43k5_29k0):
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_14k5_43k5):
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_14k5_29k0):
+	case RSL_CMODE(RSL_CMOD_SPD_DATA, RSL_CMOD_CSD_NTA_29k0_43k5):
+		/* TODO: also handle other non-transparent data rates */
 		LOGPLCHAN(lchan, DRSL, LOGL_ERROR, "Channel Mode IE contains "
 			  "unhandled non-transparent CSD data rate 0x%02x\n",
 			  cm->chan_rate & 0x3f);

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/23792
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I125cdaaf5adac0891a964c9834b99eb5a35ce262
Gerrit-Change-Number: 23792
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210419/2e6f719d/attachment.htm>


More information about the gerrit-log mailing list