drop bogus support for AMR OFR and OHR variants

Looking at 3GPP TS 26.103 table 4.1, none of the AMR-Oxx variants are
supported by GERAN-GMSK nor UTRAN, so it makes no sense to include
these. There are no users of this.

Change-Id: I0cbc770fff55209676d9b6aae50011d6d5f897e2

4 files changed, 22 insertions, 50 deletions

diff --git a/src/libmsc/codec_filter.c b/src/libmsc/codec_filter.c
index 7511f9026..5485814f6 100644
--- a/src/libmsc/codec_filter.c
+++ b/src/libmsc/codec_filter.c
@@ -50,10 +50,7 @@ static void sdp_add_all_utran_codecs(struct sdp_audio_codecs *ac)
 	static const enum gsm48_bcap_speech_ver utran_codecs[] = {
 		GSM48_BCAP_SV_AMR_F	/*!< 4   GSM FR V3 (FR AMR) */,
 		GSM48_BCAP_SV_AMR_H	/*!< 5   GSM HR V3 (HR_AMR) */,
-		GSM48_BCAP_SV_AMR_OH	/*!< 11  GSM HR V6 (OHR AMR) */,
 		GSM48_BCAP_SV_AMR_FW	/*!< 8   GSM FR V5 (FR AMR-WB) */,
-		GSM48_BCAP_SV_AMR_OFW	/*!< 6   GSM FR V4 (OFR AMR-WB) */,
-		GSM48_BCAP_SV_AMR_OHW	/*!< 7   GSM HR V4 (OHR AMR-WB) */,
 	};
 	int i;
 	for (i = 0; i < ARRAY_SIZE(utran_codecs); i++)
diff --git a/src/libmsc/codec_mapping.c b/src/libmsc/codec_mapping.c
index bb5968f0e..55efd8de4 100644
--- a/src/libmsc/codec_mapping.c
+++ b/src/libmsc/codec_mapping.c
@@ -142,8 +142,8 @@ const struct codec_mapping codec_map[] = {
 			.fmtp = "octet-align=1",
 		},
 		.mgcp = CODEC_AMR_8000_1,
-		.speech_ver_count = 2,
-		.speech_ver = { GSM48_BCAP_SV_AMR_H, GSM48_BCAP_SV_AMR_OH },
+		.speech_ver_count = 1,
+		.speech_ver = { GSM48_BCAP_SV_AMR_H },
 		.mncc_payload_msg_type = GSM_TCH_FRAME_AMR,
 		.has_gsm0808_speech_codec = true,
 		.gsm0808_speech_codec = {
@@ -175,27 +175,6 @@ const struct codec_mapping codec_map[] = {
 		.frhr = CODEC_FRHR_FR,
 	},
 	{
-		/* Another entry like the above, to map HR4 to AMR-WB, too. */
-		.sdp = {
-			.payload_type = 113,
-			.subtype_name = "AMR-WB",
-			.rate = 16000,
-			.fmtp = "octet-align=1",
-		},
-		.mgcp = CODEC_AMRWB_16000_1,
-		.speech_ver_count = 1,
-		.speech_ver = { GSM48_BCAP_SV_AMR_OHW },
-		.mncc_payload_msg_type = GSM_TCH_FRAME_AMR,
-		.has_gsm0808_speech_codec = true,
-		.gsm0808_speech_codec = {
-			.fi = true,
-			.type = GSM0808_SCT_HR4,
-			.cfg = GSM0808_SC_CFG_DEFAULT_OHR_AMR_WB,
-		},
-		.perm_speech = GSM0808_PERM_HR4,
-		.frhr = CODEC_FRHR_HR,
-	},
-	{
 		.sdp = {
 			.payload_type = 96,
 			.subtype_name = "VND.3GPP.IUFP",
diff --git a/tests/msc_vlr/msc_vlr_test_call.c b/tests/msc_vlr/msc_vlr_test_call.c
index 14c8ea304..046fd72f2 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -339,7 +339,7 @@ static void test_call_mt()
 		/* NOTE: below SDP includes only AMR, above bearer_cap includes more codecs. Ideally, these would match,
 		 * but in reality the bearer cap in MNCC was never implemented properly. This test shows that above
 		 * bearer_cap is ignored when SDP is present: In the CC Setup below, the Bearer Capability is only
-		 * "04 04 60 04 05 8b" with speech versions '04' == GSM48_BCAP_SV_AMR_F and '05' == GSM48_BCAP_SV_AMR_H.
+		 * "04 03 60 04 85" with speech versions '04' == GSM48_BCAP_SV_AMR_F and '05' == GSM48_BCAP_SV_AMR_H.
 		 */
 		.sdp = "v=0\r\n"
 		       "o=OsmoMSC 0 0 IN IP4 10.23.23.1\r\n"
@@ -386,7 +386,7 @@ static void test_call_mt()
 	VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d");
 
 	btw("MS sends SecurityModeControl acceptance, VLR accepts, sends CC Setup");
-	dtap_expect_tx("0305" /* CC: Setup */ "04 04 60 04 05 8b" /* Bearer Cap, speech ver of AMR-FR and AMR-HR */);
+	dtap_expect_tx("0305" /* CC: Setup */ "04 03 60 04 85" /* Bearer Cap, speech ver of AMR-FR and AMR-HR */);
 	ms_sends_security_mode_complete(1);
 
 	btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND");
@@ -469,7 +469,7 @@ static void test_call_mt2()
 		/* NOTE: below SDP includes only AMR, above bearer_cap includes only GSM-FR. Ideally, these would match,
 		 * but in reality the bearer cap in MNCC was never implemented properly. This test shows that above
 		 * bearer_cap is ignored when SDP is present: In the CC Setup below, the Bearer Capability is only
-		 * "04 04 60 04 05 8b" with speech versions '04' == GSM48_BCAP_SV_AMR_F and '05' == GSM48_BCAP_SV_AMR_H.
+		 * "04 03 60 04 85" with speech versions '04' == GSM48_BCAP_SV_AMR_F and '05' == GSM48_BCAP_SV_AMR_H.
 		 */
 		.sdp = "v=0\r\n"
 		       "o=OsmoMSC 0 0 IN IP4 10.23.23.1\r\n"
@@ -524,7 +524,7 @@ static void test_call_mt2()
 	VERBOSE_ASSERT(security_mode_ctrl_sent, == true, "%d");
 
 	btw("MS sends SecurityModeControl acceptance, VLR accepts, sends CC Setup");
-	dtap_expect_tx("0305" /* CC: Setup */ "04 04 60 04 05 8b" /* Bearer Cap, speech ver of AMR-FR and AMR-HR */);
+	dtap_expect_tx("0305" /* CC: Setup */ "04 03 60 04 85" /* Bearer Cap, speech ver of AMR-FR and AMR-HR */);
 	ms_sends_security_mode_complete(1);
 
 	btw("MS confirms call, we create a RAN-side RTP and forward MNCC_CALL_CONF_IND");
@@ -851,7 +851,6 @@ struct codec_test {
 #define BCAP_ALL_GSM { \
 			GSM48_BCAP_SV_AMR_F, \
 			GSM48_BCAP_SV_AMR_H, \
-			GSM48_BCAP_SV_AMR_OH, \
 			GSM48_BCAP_SV_EFR, \
 			GSM48_BCAP_SV_FR, \
 			GSM48_BCAP_SV_HR, \
@@ -889,7 +888,6 @@ static const struct codec_test codec_tests[] = {
 		.mt_tx_cc_setup_bcap = {
 			GSM48_BCAP_SV_AMR_F,
 			GSM48_BCAP_SV_AMR_H,
-			GSM48_BCAP_SV_AMR_OH,
 			GSM48_BCAP_SV_EFR,
 			GSM48_BCAP_SV_FR,
 			GSM48_BCAP_SV_HR,
@@ -1053,7 +1051,6 @@ static const struct codec_test codec_tests[] = {
 		.mt_tx_cc_setup_bcap = {
 			GSM48_BCAP_SV_AMR_F,
 			GSM48_BCAP_SV_AMR_H,
-			GSM48_BCAP_SV_AMR_OH,
 			GSM48_BCAP_SV_EFR,
 			GSM48_BCAP_SV_FR,
 			GSM48_BCAP_SV_HR,
@@ -1091,7 +1088,6 @@ static const struct codec_test codec_tests[] = {
 		.mt_tx_cc_setup_bcap = {
 			GSM48_BCAP_SV_AMR_F,
 			GSM48_BCAP_SV_AMR_H,
-			GSM48_BCAP_SV_AMR_OH,
 			GSM48_BCAP_SV_EFR,
 			GSM48_BCAP_SV_FR,
 			GSM48_BCAP_SV_HR,
diff --git a/tests/msc_vlr/msc_vlr_test_call.err b/tests/msc_vlr/msc_vlr_test_call.err
index 6fae30e73..6a890ae00 100644
--- a/tests/msc_vlr/msc_vlr_test_call.err
+++ b/tests/msc_vlr/msc_vlr_test_call.err
@@ -800,7 +800,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAG
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on UTRAN-Iu
-- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 030504046004058b
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 03050403600485
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 3 (attached,CC,active-conn)
@@ -1320,7 +1320,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAG
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DIUCS msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on UTRAN-Iu
-- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 030504046004058b
+- DTAP --UTRAN-Iu--> MS: GSM48_MT_CC_SETUP: 03050403600485
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100:UTRAN-Iu:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-42342:TMSI-0x03020100 - Paging: now used by 3 (attached,CC,active-conn)
@@ -2566,7 +2566,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -2875,7 +2875,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 + Paging: now used by 4 (attac
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - mncc_tx_to_gsm_cc: now used by 3 (attached,CC,Paging)
   paging_sent == 1
 - MS replies with Paging Response, with Codec List (BSS Supported) = FR1 FR2 FR3 HR1 HR3
-- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMSC msub_fsm{active}: Allocated
@@ -2923,7 +2923,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on GERAN-A
-- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 030504076004050b020081
+- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 03050406600405020081
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - Paging: now used by 4 (attached,CC,proc_arq_vlr_fn_init,active-conn)
@@ -3205,7 +3205,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -4411,7 +4411,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -5041,7 +5041,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -5353,7 +5353,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 + Paging: now used by 4 (attac
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - mncc_tx_to_gsm_cc: now used by 3 (attached,CC,Paging)
   paging_sent == 1
 - MS replies with Paging Response, with Codec List (BSS Supported) = FR1 FR2 FR3 HR1 HR3
-- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMSC msub_fsm{active}: Allocated
@@ -5401,7 +5401,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on GERAN-A
-- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 030504076004050b020081
+- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 03050406600405020081
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - Paging: now used by 4 (attached,CC,proc_arq_vlr_fn_init,active-conn)
@@ -5671,7 +5671,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -5980,7 +5980,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 + Paging: now used by 4 (attac
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - mncc_tx_to_gsm_cc: now used by 3 (attached,CC,Paging)
   paging_sent == 1
 - MS replies with Paging Response, with Codec List (BSS Supported) = FR1 FR2 FR3 HR1 HR3
-- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMSC msub_fsm{active}: Allocated
@@ -6028,7 +6028,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on GERAN-A
-- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 030504076004050b020081
+- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 03050406600405020081
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - Paging: now used by 4 (attached,CC,proc_arq_vlr_fn_init,active-conn)
@@ -6310,7 +6310,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - proc_arq_vlr_fn_init: now us
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: - rx_from_ms: now used by 1 (cm_service_cc)
   cm_service_result_sent == 1
 msc_a_is_accepted() == true
-- MS sends CC SETUP with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- MS sends CC SETUP with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_CC_SETUP
 DREF msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: + rx_from_ms: now used by 2 (cm_service_cc,rx_from_ms)
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:CM_SERVICE_REQ){MSC_A_ST_AUTHENTICATED}: RAN decode: DTAP
@@ -6619,7 +6619,7 @@ DREF VLR subscr IMSI-901700000010650:MSISDN-46071 + Paging: now used by 4 (attac
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - mncc_tx_to_gsm_cc: now used by 3 (attached,CC,Paging)
   paging_sent == 1
 - MS replies with Paging Response, with Codec List (BSS Supported) = FR1 FR2 FR3 HR1 HR3
-- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR AMR GSM-EFR GSM GSM-HR-08
+- VLR accepts, MSC sends CC Setup with Bearer Capability =  AMR AMR GSM-EFR GSM GSM-HR-08
   MSC <--GERAN-A-- MS: GSM48_MT_RR_PAG_RESP
   new conn
 DMSC msub_fsm{active}: Allocated
@@ -6667,7 +6667,7 @@ DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-
 DCC trans(CC:NULL IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP callref-0x423 tid-0) new state NULL -> CALL_PRESENT
 DBSSAP msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: Sending DTAP: CC GSM48_MT_CC_SETUP
 DMSC msc_a(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){MSC_A_ST_COMMUNICATING}: RAN encode: DTAP on GERAN-A
-- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 030504076004050b020081
+- DTAP --GERAN-A--> MS: GSM48_MT_CC_SETUP: 03050406600405020081
 - DTAP matches expected message
 DMSC dummy_msc_i(IMSI-901700000010650:MSISDN-46071:GERAN-A:PAGING_RESP){0}: Received Event MSC_I_EV_FROM_A_FORWARD_ACCESS_SIGNALLING_REQUEST
 DREF VLR subscr IMSI-901700000010650:MSISDN-46071 - Paging: now used by 4 (attached,CC,proc_arq_vlr_fn_init,active-conn)