[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
..
mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/mobile/mnccms.c
M src/host/layer23/src/mobile/vty_interface.c
4 files changed, 20 insertions(+), 33 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index 3873611..ecebae8 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -6,6 +6,7 @@
#include
#include
#include
+#include
#include
#include
@@ -130,19 +131,11 @@
DATA_CALL_RATE_V110_14400,
};
-/* Connection Element (transparency) */
-enum data_call_ce {
- DATA_CALL_CE_TRANSP,
- DATA_CALL_CE_TRANSP_PREF,
- DATA_CALL_CE_NON_TRANSP,
- DATA_CALL_CE_NON_TRANSP_PREF,
-};
-
/* Data (CSD) call parameters */
struct data_call_params {
- enum data_call_type type;
- enum data_call_rate rate;
- enum data_call_ce ce;
+ enum data_call_type type;
+ enum data_call_rate rate;
+ enum gsm48_bcap_transp transp;
};
struct gsm_settings {
diff --git a/src/host/layer23/src/common/settings.c
b/src/host/layer23/src/common/settings.c
index 3fca52d..6ffb095 100644
--- a/src/host/layer23/src/common/settings.c
+++ b/src/host/layer23/src/common/settings.c
@@ -138,7 +138,7 @@
set->call_params.data = (struct data_call_params) {
.type = DATA_CALL_TYPE_ISDN,
.rate = DATA_CALL_RATE_V110_9600,
- .ce = DATA_CALL_CE_TRANSP,
+ .transp = GSM48_BCAP_TR_TRANSP,
};
return 0;
diff --git a/src/host/layer23/src/mobile/mnccms.c
b/src/host/layer23/src/mobile/mnccms.c
index c03eed5..4bdb845 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -218,7 +218,7 @@
.rate_adaption = GSM48_BCAP_RA_V110_X30,
.sig_access = GSM48_BCAP_SA_I440_I450,
.async = 1,
- /* .transp is set below */
+ .transp = cp->transp,
.nr_data_bits = 8,
.parity = GSM48_BCAP_PAR_NONE,
.nr_stop_bits = 1,
@@ -284,22 +284,6 @@
break;
}
- /* Connection element (octet 6c) */
- switch (cp->ce) {
- case DATA_CALL_CE_TRANSP:
- bcap->data.transp = GSM48_BCAP_TR_TRANSP;
- break;
- case DATA_CALL_CE_TRANSP_PREF:
- bcap->data.transp = GSM48_BCAP_TR_TR_PREF;
- break;
- case DATA_CALL_CE_NON_TRANSP:
- bcap->data.transp = GSM48_BCAP_TR_RLP;
- break;
- case DATA_CALL_CE_NON_TRANSP_PREF:
- bcap->data.transp = GSM48_BCAP_TR_RLP_PREF;
- break;
- }
-
/* FAX calls are special (see 3GPP TS 24.008, Annex D.3) */
if (call_type == GSM_CALL_T_DATA_FAX) {
bcap->data.rate_adaption = GSM48_BCAP_RA_NONE;
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index 6293768..05a20e4 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -741,14 +741,14 @@
if (!strcmp(argv[1], "transparent")) {
if (argc > 2)
- cp->ce = DATA_CALL_CE_TRANSP_PREF;
+ cp->transp = GSM48_BCAP_TR_TR_PREF;
else
- cp->ce = DATA_CALL_CE_TRANSP;
+ cp->transp = GSM48_BCAP_TR_TRANSP;
} else if (!strcmp(argv[1], "non-transparent")) {
if (argc > 2)
- cp->ce = DATA_CALL_CE_NON_TRANSP_PREF;
+ cp->transp = GSM48_BCAP_TR_RLP_PREF;
else
- cp->ce = DATA_CALL_CE_NON_TRANSP;
+ cp->transp = GSM48_BCAP_TR_RLP;
} else { /* should not happen */
return CMD_WARNING;
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit
[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email to look at the new patch set (#2). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm .. mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd Related: OS#4396 --- M src/host/layer23/include/osmocom/bb/common/settings.h M src/host/layer23/src/common/settings.c M src/host/layer23/src/mobile/mnccms.c M src/host/layer23/src/mobile/vty_interface.c 4 files changed, 20 insertions(+), 33 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/35661/2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd Gerrit-Change-Number: 35661 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email ) Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd Gerrit-Change-Number: 35661 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 24 Jan 2024 13:55:43 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email ) Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd Gerrit-Change-Number: 35661 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 24 Jan 2024 12:29:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email ) Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd Gerrit-Change-Number: 35661 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Attention: fixeria Gerrit-Comment-Date: Wed, 24 Jan 2024 08:39:15 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
[M] Change in osmocom-bb[master]: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email )
Change subject: mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
..
mobile: VTY: use 'enum gsm48_bcap_transp' from libosmogsm
Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd
Related: OS#4396
---
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/mobile/mnccms.c
M src/host/layer23/src/mobile/vty_interface.c
4 files changed, 20 insertions(+), 33 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/61/35661/1
diff --git a/src/host/layer23/include/osmocom/bb/common/settings.h
b/src/host/layer23/include/osmocom/bb/common/settings.h
index 3873611..ecebae8 100644
--- a/src/host/layer23/include/osmocom/bb/common/settings.h
+++ b/src/host/layer23/include/osmocom/bb/common/settings.h
@@ -6,6 +6,7 @@
#include
#include
#include
+#include
#include
#include
@@ -130,19 +131,11 @@
DATA_CALL_RATE_V110_14400,
};
-/* Connection Element (transparency) */
-enum data_call_ce {
- DATA_CALL_CE_TRANSP,
- DATA_CALL_CE_TRANSP_PREF,
- DATA_CALL_CE_NON_TRANSP,
- DATA_CALL_CE_NON_TRANSP_PREF,
-};
-
/* Data (CSD) call parameters */
struct data_call_params {
- enum data_call_type type;
- enum data_call_rate rate;
- enum data_call_ce ce;
+ enum data_call_type type;
+ enum data_call_rate rate;
+ enum gsm48_bcap_transp transp;
};
struct gsm_settings {
diff --git a/src/host/layer23/src/common/settings.c
b/src/host/layer23/src/common/settings.c
index 3fca52d..6ffb095 100644
--- a/src/host/layer23/src/common/settings.c
+++ b/src/host/layer23/src/common/settings.c
@@ -138,7 +138,7 @@
set->call_params.data = (struct data_call_params) {
.type = DATA_CALL_TYPE_ISDN,
.rate = DATA_CALL_RATE_V110_9600,
- .ce = DATA_CALL_CE_TRANSP,
+ .transp = GSM48_BCAP_TR_TRANSP,
};
return 0;
diff --git a/src/host/layer23/src/mobile/mnccms.c
b/src/host/layer23/src/mobile/mnccms.c
index c03eed5..4bdb845 100644
--- a/src/host/layer23/src/mobile/mnccms.c
+++ b/src/host/layer23/src/mobile/mnccms.c
@@ -218,7 +218,7 @@
.rate_adaption = GSM48_BCAP_RA_V110_X30,
.sig_access = GSM48_BCAP_SA_I440_I450,
.async = 1,
- /* .transp is set below */
+ .transp = cp->transp,
.nr_data_bits = 8,
.parity = GSM48_BCAP_PAR_NONE,
.nr_stop_bits = 1,
@@ -284,22 +284,6 @@
break;
}
- /* Connection element (octet 6c) */
- switch (cp->ce) {
- case DATA_CALL_CE_TRANSP:
- bcap->data.transp = GSM48_BCAP_TR_TRANSP;
- break;
- case DATA_CALL_CE_TRANSP_PREF:
- bcap->data.transp = GSM48_BCAP_TR_TR_PREF;
- break;
- case DATA_CALL_CE_NON_TRANSP:
- bcap->data.transp = GSM48_BCAP_TR_RLP;
- break;
- case DATA_CALL_CE_NON_TRANSP_PREF:
- bcap->data.transp = GSM48_BCAP_TR_RLP_PREF;
- break;
- }
-
/* FAX calls are special (see 3GPP TS 24.008, Annex D.3) */
if (call_type == GSM_CALL_T_DATA_FAX) {
bcap->data.rate_adaption = GSM48_BCAP_RA_NONE;
diff --git a/src/host/layer23/src/mobile/vty_interface.c
b/src/host/layer23/src/mobile/vty_interface.c
index 6293768..05a20e4 100644
--- a/src/host/layer23/src/mobile/vty_interface.c
+++ b/src/host/layer23/src/mobile/vty_interface.c
@@ -741,14 +741,14 @@
if (!strcmp(argv[1], "transparent")) {
if (argc > 2)
- cp->ce = DATA_CALL_CE_TRANSP_PREF;
+ cp->transp = GSM48_BCAP_TR_TR_PREF;
else
- cp->ce = DATA_CALL_CE_TRANSP;
+ cp->transp = GSM48_BCAP_TR_TRANSP;
} else if (!strcmp(argv[1], "non-transparent")) {
if (argc > 2)
- cp->ce = DATA_CALL_CE_NON_TRANSP_PREF;
+ cp->transp = GSM48_BCAP_TR_RLP_PREF;
else
- cp->ce = DATA_CALL_CE_NON_TRANSP;
+ cp->transp = GSM48_BCAP_TR_RLP;
} else { /* should not happen */
return CMD_WARNING;
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/35661?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: Iebc0692f17a5a5d04e57d74a720db52775937bdd
Gerrit-Change-Number: 35661
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
