Change in libosmocore[master]: Add MO-FALLBACK-VALUE SGsAP IE
Omar Ramadan has uploaded this change for review. (
https://gerrit.osmocom.org/13952
Change subject: Add MO-FALLBACK-VALUE SGsAP IE
..
Add MO-FALLBACK-VALUE SGsAP IE
In testing against a particular EPC, the SGsAP-SERVICE-REQUEST can contain a MO
fallback value TLV with T 0xF1
Change-Id: Ia2460af9673818d375e28c67f1631b5f7eacdaeb
---
M include/osmocom/gsm/protocol/gsm_29_118.h
M src/gsm/gsm29118.c
2 files changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/13952/1
diff --git a/include/osmocom/gsm/protocol/gsm_29_118.h
b/include/osmocom/gsm/protocol/gsm_29_118.h
index cfe772a..9adb90f 100644
--- a/include/osmocom/gsm/protocol/gsm_29_118.h
+++ b/include/osmocom/gsm/protocol/gsm_29_118.h
@@ -73,6 +73,7 @@
SGSAP_IE_UE_EMM_MODE= 0x25,
SGSAP_IE_ADDL_PAGING_INDICATORS = 0x26,
SGSAP_IE_TMSI_BASED_NRI_CONT= 0x27,
+ SGSAP_IE_MO_FALLBACK_VALUE = 0xf1,
};
extern const struct value_string sgsap_iei_names[];
static inline const char *sgsap_iei_name(enum sgsap_iei iei) {
diff --git a/src/gsm/gsm29118.c b/src/gsm/gsm29118.c
index 56e7473..2c02b2f 100644
--- a/src/gsm/gsm29118.c
+++ b/src/gsm/gsm29118.c
@@ -89,6 +89,7 @@
{ SGSAP_IE_UE_EMM_MODE, "UE-EMM-MODE" },
{ SGSAP_IE_ADDL_PAGING_INDICATORS, "ADDL-PAGING-INDICATORS" },
{ SGSAP_IE_TMSI_BASED_NRI_CONT, "TMSI-BASED-NRI-CONT" },
+ { SGSAP_IE_MO_FALLBACK_VALUE, "MO-FALLBACK-VALUE" },
{ 0, NULL }
};
@@ -179,6 +180,7 @@
[SGSAP_IE_UE_EMM_MODE] = { TLV_TYPE_TLV },
[SGSAP_IE_ADDL_PAGING_INDICATORS]={ TLV_TYPE_TLV },
[SGSAP_IE_TMSI_BASED_NRI_CONT] = { TLV_TYPE_TLV },
+ [SGSAP_IE_MO_FALLBACK_VALUE]= { TLV_TYPE_TLV },
},
};
--
To view, visit https://gerrit.osmocom.org/13952
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2460af9673818d375e28c67f1631b5f7eacdaeb
Gerrit-Change-Number: 13952
Gerrit-PatchSet: 1
Gerrit-Owner: Omar Ramadan
Change in libosmocore[master]: Add MO-FALLBACK-VALUE SGsAP IE
Omar Ramadan has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/13952 ) Change subject: Add MO-FALLBACK-VALUE SGsAP IE .. Add MO-FALLBACK-VALUE SGsAP IE In testing against a particular EPC, the SGsAP-SERVICE-REQUEST can contain a MO fallback value TLV with T 0xF1 Change-Id: Ia2460af9673818d375e28c67f1631b5f7eacdaeb --- M include/osmocom/gsm/protocol/gsm_29_118.h M src/gsm/gsm29118.c 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/52/13952/2 -- To view, visit https://gerrit.osmocom.org/13952 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: Ia2460af9673818d375e28c67f1631b5f7eacdaeb Gerrit-Change-Number: 13952 Gerrit-PatchSet: 2 Gerrit-Owner: Omar Ramadan Gerrit-CC: Jenkins Builder (102)
Change in osmo-msc[master]: Allow MME name preformatted as FQDN in SGsAP
Omar Ramadan has submitted this change and it was merged. (
https://gerrit.osmocom.org/13627 )
Change subject: Allow MME name preformatted as FQDN in SGsAP
..
Allow MME name preformatted as FQDN in SGsAP
Change-Id: I2d55f9524b9fc15d661e5cb6b5df6d715c52ccf9
---
M src/libmsc/sgs_iface.c
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c
index eed107a..8b4b61d 100644
--- a/src/libmsc/sgs_iface.c
+++ b/src/libmsc/sgs_iface.c
@@ -168,6 +168,12 @@
if (!mme_name_enc)
return -EINVAL;
+ /* some implementations use FDQN format violating TS 29.118 9.3.14 */
+ if (!osmo_parse_mme_domain(, (const char *) mme_name_enc)) {
+ memcpy(mme_name, mme_name_enc, TLVP_LEN(tp, SGSAP_IE_MME_NAME));
+ return 0;
+ }
+
/* decode the MME name from DNS labels to string */
osmo_apn_to_str(mme_name, TLVP_VAL(tp, SGSAP_IE_MME_NAME), TLVP_LEN(tp,
SGSAP_IE_MME_NAME));
--
To view, visit https://gerrit.osmocom.org/13627
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I2d55f9524b9fc15d661e5cb6b5df6d715c52ccf9
Gerrit-Change-Number: 13627
Gerrit-PatchSet: 2
Gerrit-Owner: Omar Ramadan
Gerrit-Reviewer: Harald Welte
Gerrit-Reviewer: Jenkins Builder (102)
Gerrit-Reviewer: Omar Ramadan
Change in osmo-msc[master]: Allow MME name preformatted as FQDN in SGsAP
Omar Ramadan has uploaded this change for review. (
https://gerrit.osmocom.org/13627
Change subject: Allow MME name preformatted as FQDN in SGsAP
..
Allow MME name preformatted as FQDN in SGsAP
Change-Id: I2d55f9524b9fc15d661e5cb6b5df6d715c52ccf9
---
M src/libmsc/sgs_iface.c
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/27/13627/1
diff --git a/src/libmsc/sgs_iface.c b/src/libmsc/sgs_iface.c
index f64b191..9ad8021 100644
--- a/src/libmsc/sgs_iface.c
+++ b/src/libmsc/sgs_iface.c
@@ -167,6 +167,12 @@
if (!mme_name_enc)
return -EINVAL;
+ /* some implementations use FDQN format violating TS 29.118 9.3.14 */
+ if (!osmo_parse_mme_domain(, (const char *) mme_name_enc)) {
+ memcpy(mme_name, mme_name_enc, TLVP_LEN(tp, SGSAP_IE_MME_NAME));
+ return 0;
+ }
+
/* decode the MME name from DNS labels to string */
osmo_apn_to_str(mme_name, TLVP_VAL(tp, SGSAP_IE_MME_NAME), TLVP_LEN(tp,
SGSAP_IE_MME_NAME));
--
To view, visit https://gerrit.osmocom.org/13627
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2d55f9524b9fc15d661e5cb6b5df6d715c52ccf9
Gerrit-Change-Number: 13627
Gerrit-PatchSet: 1
Gerrit-Owner: Omar Ramadan
Change in libosmocore[master]: VTY: add command show asciidoc ctrl
Omar Ramadan has uploaded this change for review. (
https://gerrit.osmocom.org/12814
Change subject: VTY: add command show asciidoc ctrl
..
VTY: add command show asciidoc ctrl
Builds on the asciidoc VTY feature to list out all of the registered CTRL
commands for a particular project. This will help with documentation generation
efforts, and serve as a quick way to know which CTRL parameters are registered
CTRL command access mode indicator
Adds an explicit access mode enum type, ctrl_cmd_mode to ctrl_cmd_element
which provides a programatic way to detect whether a CTRL command is RO/WO/RW
Also associates the access mode with the "show asciidoc ctrl" VTY command
Change-Id: I16f59bfca72a7dd9c268bc64499b26d82a2115d2
---
M include/osmocom/ctrl/control_cmd.h
M src/ctrl/control_cmd.c
M src/ctrl/control_vty.c
3 files changed, 122 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/12814/1
diff --git a/include/osmocom/ctrl/control_cmd.h
b/include/osmocom/ctrl/control_cmd.h
index 276a7de..045bc2c 100644
--- a/include/osmocom/ctrl/control_cmd.h
+++ b/include/osmocom/ctrl/control_cmd.h
@@ -38,6 +38,13 @@
CTRL_TYPE_ERROR
};
+/*! Ctrl command modes (RO, WO, RW) */
+enum ctrl_cmd_mode {
+ CTRL_MODE_RO,
+ CTRL_MODE_WO,
+ CTRL_MODE_RW
+};
+
/*! human-readable string names for \ref ctrl_type */
extern const struct value_string ctrl_type_vals[];
@@ -96,6 +103,8 @@
/*! textual name/id of the CTRL command */
const char *name;
struct ctrl_cmd_struct strcmd;
+ /*! read/write mode of the CTRL command */
+ enum ctrl_cmd_mode mode;
/*! call-back function implementing the SET operation */
int (*set)(struct ctrl_cmd *cmd, void *data);
/*! call-back function implementing the GET operation */
@@ -125,6 +134,8 @@
int ctrl_cmd_install(enum ctrl_node_type node, struct ctrl_cmd_element *cmd);
int ctrl_cmd_send(struct osmo_wqueue *queue, struct ctrl_cmd *cmd);
int ctrl_cmd_send_to_all(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd);
+int ctrl_cmds_for_each(int (*handle_ctrl_cmd)(struct ctrl_cmd_element *, void
*),
+ enum ctrl_node_type
node, void *data);
struct ctrl_cmd *ctrl_cmd_parse3(void *ctx, struct msgb *msg, bool
*parse_failed);
struct ctrl_cmd *ctrl_cmd_parse2(void *ctx, struct msgb *msg);
struct ctrl_cmd *ctrl_cmd_parse(void *ctx, struct msgb *msg);
@@ -136,10 +147,12 @@
/*! Helper to generate static struct ctrl_cmd_element
* \param[in] cmdname symbol name of the command related functions/structures
* \param[in] cmdstr string name exposed on CTRL
+ * \param[in] cmdmode access mode of CTRL command
* \param[in] verify_name full symbol name of verification function */
-#define CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_name) \
+#define CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, cmdmode, verify_name) \
static struct ctrl_cmd_element cmd_##cmdname = { \
.name = cmdstr, \
+ .mode = cmdmode, \
.get = _##cmdname, \
.set = _##cmdname, \
.verify = verify_name, \
@@ -200,7 +213,7 @@
CTRL_HELPER_GET_INT(cmdname, dtype, element) \
CTRL_HELPER_SET_INT(cmdname, dtype, element) \
CTRL_HELPER_VERIFY_RANGE(cmdname, min, max) \
-CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname)
+CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, CTRL_MODE_RW, verify_##cmdname)
/*! Helper to generate static GET function for string
* \param[in] cmdname symbol name of the command related function
@@ -240,7 +253,7 @@
#define CTRL_CMD_DEFINE_STRING(cmdname, cmdstr, dtype, element) \
CTRL_HELPER_GET_STRING(cmdname, dtype, element) \
CTRL_HELPER_SET_STRING(cmdname, dtype, element) \
-CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, NULL)
+CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, CTRL_MODE_RW, NULL)
/*! Declare a read-write attribute. Declares get, set, verify.
* \param[in] cmdname symbol name of the command related functions/structures
@@ -249,7 +262,7 @@
static int get_##cmdname(struct ctrl_cmd *cmd, void *data); \
static int set_##cmdname(struct ctrl_cmd *cmd, void *data); \
static int verify_##cmdname(struct ctrl_cmd *cmd, const char *value, void
*data); \
-CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname)
+CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, CTRL_MODE_RW, verify_##cmdname)
/*! Define a read-only attribute. Declares get, implements set+verify
* \param[in] cmdname symbol name of the command related functions/structures
@@ -266,7 +279,7 @@
cmd->reply = "Read Only attribute"; \
return 1; \
} \
-CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, verify_##cmdname)
+CTRL_CMD_DEFINE_STRUCT(cmdname, cmdstr, CTRL_MO
Change in libosmocore[master]: VTY: add command show asciidoc ctrl
Omar Ramadan has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/12814 ) Change subject: VTY: add command show asciidoc ctrl .. VTY: add command show asciidoc ctrl Builds on the asciidoc VTY feature to list out all of the registered CTRL commands for a particular project. This will help with documentation generation efforts, and serve as a quick way to know which CTRL parameters are registered CTRL command access mode indicator Adds an explicit access mode enum type, ctrl_cmd_mode to ctrl_cmd_element which provides a programatic way to detect whether a CTRL command is RO/WO/RW Also associates the access mode with the "show asciidoc ctrl" VTY command Change-Id: I16f59bfca72a7dd9c268bc64499b26d82a2115d2 --- M include/osmocom/ctrl/control_cmd.h M src/ctrl/control_cmd.c M src/ctrl/control_vty.c 3 files changed, 120 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/14/12814/2 -- To view, visit https://gerrit.osmocom.org/12814 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I16f59bfca72a7dd9c268bc64499b26d82a2115d2 Gerrit-Change-Number: 12814 Gerrit-PatchSet: 2 Gerrit-Owner: Omar Ramadan Gerrit-CC: Jenkins Builder (102)
Change in osmo-bts[master]: Add OC-2G BTS sources
Omar Ramadan has posted comments on this change. ( https://gerrit.osmocom.org/11447 ) Change subject: Add OC-2G BTS sources .. Patch Set 4: Thanks for the review Harald. I've squashed the changes as requested and have also added oc2g as a target to jenkins_bts_model which I have verified as passing. However, it hasn't shown up in jenkins (I think we need to add the target configuration) -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 4 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102) Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Fri, 26 Oct 2018 22:58:05 + Gerrit-HasComments: No Gerrit-HasLabels: No
Change in osmo-bts[master]: Add OC-2G BTS sources
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#4). Change subject: Add OC-2G BTS sources .. Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac M contrib/jenkins_bts_model.sh A contrib/jenkins_oc2g.sh A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 57 files changed, 13,546 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/4 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 4 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bts[master]: Add OC-2G BTS sources
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#3). Change subject: Add OC-2G BTS sources .. Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 55 files changed, 13,517 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/3 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 3 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-bts[master]: Add OC-2G to build
Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11449 ) Change subject: Add OC-2G to build .. Abandoned Squashing into 11447 -- To view, visit https://gerrit.osmocom.org/11449 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771 Gerrit-Change-Number: 11449 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Harald Welte
Change in osmo-bts[master]: Add OC-2G systemd service and config
Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11448 ) Change subject: Add OC-2G systemd service and config .. Abandoned Squashing into 11447 -- To view, visit https://gerrit.osmocom.org/11448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 Gerrit-Change-Number: 11448 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Jenkins Builder (102) Gerrit-CC: Harald Welte
Change in osmo-bts[master]: Add OC-2G BTS sources
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/11447 to look at the new patch set (#2). Change subject: Add OC-2G BTS sources .. Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- M configure.ac A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg M include/osmo-bts/gsm_data_shared.h M include/osmo-bts/l1sap.h M include/osmo-bts/phy_link.h M src/Makefile.am M src/common/gsm_data_shared.c A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 56 files changed, 13,518 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/2 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 2 Gerrit-Owner: Omar Ramadan Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder (102)
Change in osmo-ci[master]: osmo-layer1-headers.sh: Add support for OC-2G
Omar Ramadan has posted comments on this change. ( https://gerrit.osmocom.org/11469 ) Change subject: osmo-layer1-headers.sh: Add support for OC-2G .. Patch Set 1: Verified+1 Code-Review+1 -- To view, visit https://gerrit.osmocom.org/11469 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Iceb62df4511ed50f0286e5762d9ffc4b068f70a6 Gerrit-Change-Number: 11469 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Omar Ramadan Gerrit-Comment-Date: Fri, 26 Oct 2018 21:48:03 + Gerrit-HasComments: No Gerrit-HasLabels: Yes
Change in osmo-bts[master]: Add OC-2G systemd service and config
Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11448 Change subject: Add OC-2G systemd service and config .. Add OC-2G systemd service and config Change-Id: Ic4b5a97b9677051442f3c3341ba23add35b43715 --- A contrib/systemd/oc2gbts-mgr.service A contrib/systemd/osmo-bts-oc2g.service A doc/examples/oc2g/oc2gbts-mgr.cfg A doc/examples/oc2g/osmo-bts.cfg 4 files changed, 121 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/48/11448/1 diff --git a/contrib/systemd/oc2gbts-mgr.service b/contrib/systemd/oc2gbts-mgr.service new file mode 100644 index 000..ed915b3 --- /dev/null +++ b/contrib/systemd/oc2gbts-mgr.service @@ -0,0 +1,29 @@ +[Unit] +Description=osmo-bts manager for OC-2G +After=oc2g-sysdev-remap.service +Wants=oc2g-sysdev-remap.service + +[Service] +Type=simple +NotifyAccess=all +WatchdogSec=21780s +Restart=always +RestartSec=2 + +# Make sure directories and symbolic link exist +ExecStartPre=/bin/sh -c 'test -d /mnt/storage/var/run/oc2gbts-mgr || mkdir -p /mnt/storage/var/run/oc2gbts-mgr ; test -d /var/run/oc2gbts-mgr || ln -sf /mnt/storage/var/run/oc2gbts-mgr/ /var/run' +# Make sure BTS operation hour exist +ExecStartPre=/bin/sh -c 'test -f /mnt/storage/var/run/oc2gbts-mgr/hours-running || echo 0 > /mnt/storage/var/run/oc2gbts-mgr/hours-running' +# Shutdown all PA correctly +ExecStartPre=/bin/sh -c 'echo disabled > /var/oc2g/pa-state/pa0/state;' +#ExecStartPre=/bin/sh -c 'echo 0 > /var/oc2g/pa-supply/max_microvolts; echo 0 > /var/oc2g/pa-supply/min_microvolts' + +ExecStart=/usr/bin/oc2gbts-mgr -s -c /etc/osmocom/oc2gbts-mgr.cfg + +# Shutdown all PA correctly +ExecStopPost=/bin/sh -c 'echo disabled > /var/oc2g/pa-state/pa0/state;' +#ExecStopPost=/bin/sh -c 'echo 0 > /var/oc2g/pa-supply/max_microvolts; echo 0 > /var/oc2g/pa-supply/min_microvolts' + +[Install] +WantedBy=multi-user.target +Alias=osmo-bts-mgr.service diff --git a/contrib/systemd/osmo-bts-oc2g.service b/contrib/systemd/osmo-bts-oc2g.service new file mode 100644 index 000..2f2d837 --- /dev/null +++ b/contrib/systemd/osmo-bts-oc2g.service @@ -0,0 +1,21 @@ +[Unit] +Description=osmo-bts for OC-2G + +[Service] +Type=simple +ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' +ExecStartPre=/bin/sh -c 'echo 1 > /sys/class/leds/usr1/brightness' +ExecStart=/usr/bin/osmo-bts-oc2g -s -c /etc/osmocom/osmo-bts.cfg -M +ExecStopPost=/bin/sh -c 'echo 1 > /sys/class/leds/usr0/brightness' +ExecStopPost=/bin/sh -c 'echo 0 > /sys/class/leds/usr1/brightness' +Restart=always +RestartSec=2 +RestartPreventExitStatus=1 + +# The msg queues must be read fast enough +CPUSchedulingPolicy=rr +CPUSchedulingPriority=1 + +[Install] +WantedBy=multi-user.target +Alias=osmo-bts.service diff --git a/doc/examples/oc2g/oc2gbts-mgr.cfg b/doc/examples/oc2g/oc2gbts-mgr.cfg new file mode 100644 index 000..8248f60 --- /dev/null +++ b/doc/examples/oc2g/oc2gbts-mgr.cfg @@ -0,0 +1,33 @@ +! +! oc2gbts-mgr (0.3.0.284-a7c2-dirty) configuration saved from vty +!! +! +log stderr + logging filter all 1 + logging color 1 + logging print category 0 + logging timestamp 0 + logging level temp info + logging level fw info + logging level find info + logging level calib info + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice + logging level lctrl notice + logging level lgtp notice +! +line vty + no login +! +oc2gbts-mgr + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 diff --git a/doc/examples/oc2g/osmo-bts.cfg b/doc/examples/oc2g/osmo-bts.cfg new file mode 100644 index 000..f985f3b --- /dev/null +++ b/doc/examples/oc2g/osmo-bts.cfg @@ -0,0 +1,38 @@ +! +! OsmoBTS (0.0.1.100-0455-dirty) configuration saved from vty +!! +! +log stderr + logging color 1 + logging timestamp 0 + logging level rsl info + logging level oml info + logging level rll notice + logging level rr notice + logging level meas notice + logging level pag info + logging level l1c info + logging level l1p info + logging level dsp debug + logging level abis notice + logging level rtp notice + logging level lglobal notice + logging level llapd notice + logging level linp notice + logging level lmux notice + logging level lmi notice + logging level lmib notice + logging level lsms notice +! +line vty + no login +! +phy 0 + instance 0 + trx-calibration-path /mnt/rom/factory/calib +bts 0 + band 900 + ipa unit-id 1500 0 + oml remote-ip 10.42.0.1 + trx 0 + phy 0 instance 0 -- To view, visit https://gerrit.osmocom.org/11448 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerri
Change in osmo-bts[master]: Add OC-2G to build
Omar Ramadan has uploaded this change for review. (
https://gerrit.osmocom.org/11449
Change subject: Add OC-2G to build
..
Add OC-2G to build
Change-Id: I4a8dcf759a2818c8e457bcb82775c4e60c94d771
---
M configure.ac
M include/osmo-bts/gsm_data_shared.h
M include/osmo-bts/l1sap.h
M include/osmo-bts/phy_link.h
M src/Makefile.am
M src/common/gsm_data_shared.c
6 files changed, 55 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/49/11449/1
diff --git a/configure.ac b/configure.ac
index f2d4f84..9a8d58f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -279,6 +279,27 @@
CPPFLAGS=$oldCPPFLAGS
fi
+AC_MSG_CHECKING([whether to enable NuRAN Wireless OC-2G hardware support])
+AC_ARG_ENABLE(oc2g,
+ AC_HELP_STRING([--enable-oc2g],
+ [enable code for NuRAN Wireless OC-2G bts
[default=no]]),
+ [enable_oc2g="yes"],[enable_oc2g="no"])
+AC_ARG_WITH([oc2g], [AS_HELP_STRING([--with-oc2g=INCLUDE_DIR], [Location of
the OC-2G API header files])],
+[oc2g_incdir="$withval"],[oc2g_incdir="$incdir"])
+AC_SUBST([OC2G_INCDIR], -I$oc2g_incdir)
+AC_MSG_RESULT([$enable_oc2g])
+AM_CONDITIONAL(ENABLE_OC2GBTS, test "x$enable_oc2g" = "xyes")
+if test "$enable_oc2g" = "yes"; then
+ oldCPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS $OC2G_INCDIR -I$srcdir/include"
+ AC_CHECK_HEADER([nrw/oc2g/oc2g.h],[],
+ [AC_MSG_ERROR([nrw/oc2g/oc2g.h can not be found in
$oc2g_incdir])],
+ [#include ])
+ PKG_CHECK_MODULES(LIBSYSTEMD, libsystemd)
+PKG_CHECK_MODULES(LIBGPS, libgps)
+ CPPFLAGS=$oldCPPFLAGS
+fi
+
# https://www.freedesktop.org/software/systemd/man/daemon.html
AC_ARG_WITH([systemdsystemunitdir],
[AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd
service files])],,
@@ -307,6 +328,7 @@
src/osmo-bts-omldummy/Makefile
src/osmo-bts-sysmo/Makefile
src/osmo-bts-litecell15/Makefile
+src/osmo-bts-oc2g/Makefile
src/osmo-bts-trx/Makefile
src/osmo-bts-octphy/Makefile
include/Makefile
diff --git a/include/osmo-bts/gsm_data_shared.h
b/include/osmo-bts/gsm_data_shared.h
index 794eaea..80784af 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -411,6 +411,9 @@
uint16_t arfcn;
int nominal_power; /* in dBm */
unsigned int max_power_red; /* in actual dB */
+uint8_t max_power_backoff_8psk; /* in actual dB */
+uint8_t c0_idle_power_red; /* in actual dB */
+
struct trx_power_params power_params;
int ms_power_control;
@@ -437,6 +440,7 @@
enum gsm_bts_type_variant {
BTS_UNKNOWN,
BTS_OSMO_LITECELL15,
+BTS_OSMO_OC2G,
BTS_OSMO_OCTPHY,
BTS_OSMO_SYSMO,
BTS_OSMO_TRX,
@@ -746,7 +750,14 @@
struct timeval tv_clock;
struct osmo_timer_list fn_timer;
} vbts;
-
+#ifdef ENABLE_OC2GBTS
+/* specific to Open Cellular 2G BTS */
+struct {
+uint8_t led_ctrl_mode; /* 0:
control by BTS, 1: not control by BTS */
+struct llist_head ceased_alarm_list;/* ceased alarm list*/
+unsigned int rtp_drift_thres_ms;/* RTP
timestamp drift detection threshold */
+} oc2g;
+#endif
};
diff --git a/include/osmo-bts/l1sap.h b/include/osmo-bts/l1sap.h
index 3cf0ea5..4c30589 100644
--- a/include/osmo-bts/l1sap.h
+++ b/include/osmo-bts/l1sap.h
@@ -50,7 +50,7 @@
static inline uint8_t l1sap_chan2ss(uint8_t chan_nr)
{
if (L1SAP_IS_CHAN_BCCH(chan_nr))
-return L1SAP_CHAN2SS_BCCH(chan_nr);
+ return L1SAP_CHAN2SS_BCCH(chan_nr);
if (L1SAP_IS_CHAN_SDCCH8(chan_nr))
return L1SAP_CHAN2SS_SDCCH8(chan_nr);
if (L1SAP_IS_CHAN_SDCCH4(chan_nr))
diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h
index 36e34e1..2472c05 100644
--- a/include/osmo-bts/phy_link.h
+++ b/include/osmo-bts/phy_link.h
@@ -135,6 +135,20 @@
uint8_t tx_pwr_adj_mode;/* 0: no auto adjust
power, 1: auto adjust power using RMS detector */
uint8_t tx_pwr_red_8psk;/* 8-PSK maximum Tx
power reduction level in dB */
} lc15;
+struct {
+/* configuration */
+uint32_t dsp_trace_f;
+char *calib_path;
+int minTxPower;
+int maxTxPower;
+struct oc2gl1_hdl *hdl;
+uint8_t max_cell_size; /* 0:166 qbits*/
+ui
Change in osmo-bts[master]: Add OC-2G BTS sources
Omar Ramadan has uploaded this change for review. ( https://gerrit.osmocom.org/11447 Change subject: Add OC-2G BTS sources .. Add OC-2G BTS sources Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 --- A src/osmo-bts-oc2g/Makefile.am A src/osmo-bts-oc2g/calib_file.c A src/osmo-bts-oc2g/hw_info.ver_major A src/osmo-bts-oc2g/hw_misc.c A src/osmo-bts-oc2g/hw_misc.h A src/osmo-bts-oc2g/l1_if.c A src/osmo-bts-oc2g/l1_if.h A src/osmo-bts-oc2g/l1_transp.h A src/osmo-bts-oc2g/l1_transp_hw.c A src/osmo-bts-oc2g/main.c A src/osmo-bts-oc2g/misc/.dirstamp A src/osmo-bts-oc2g/misc/oc2gbts_bid.c A src/osmo-bts-oc2g/misc/oc2gbts_bid.h A src/osmo-bts-oc2g/misc/oc2gbts_bts.c A src/osmo-bts-oc2g/misc/oc2gbts_bts.h A src/osmo-bts-oc2g/misc/oc2gbts_clock.c A src/osmo-bts-oc2g/misc/oc2gbts_clock.h A src/osmo-bts-oc2g/misc/oc2gbts_led.c A src/osmo-bts-oc2g/misc/oc2gbts_led.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr.h A src/osmo-bts-oc2g/misc/oc2gbts_mgr_calib.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_mgr_vty.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.c A src/osmo-bts-oc2g/misc/oc2gbts_misc.h A src/osmo-bts-oc2g/misc/oc2gbts_nl.c A src/osmo-bts-oc2g/misc/oc2gbts_nl.h A src/osmo-bts-oc2g/misc/oc2gbts_par.c A src/osmo-bts-oc2g/misc/oc2gbts_par.h A src/osmo-bts-oc2g/misc/oc2gbts_power.c A src/osmo-bts-oc2g/misc/oc2gbts_power.h A src/osmo-bts-oc2g/misc/oc2gbts_swd.c A src/osmo-bts-oc2g/misc/oc2gbts_swd.h A src/osmo-bts-oc2g/misc/oc2gbts_temp.c A src/osmo-bts-oc2g/misc/oc2gbts_temp.h A src/osmo-bts-oc2g/misc/oc2gbts_util.c A src/osmo-bts-oc2g/oc2gbts.c A src/osmo-bts-oc2g/oc2gbts.h A src/osmo-bts-oc2g/oc2gbts_vty.c A src/osmo-bts-oc2g/oml.c A src/osmo-bts-oc2g/oml_router.c A src/osmo-bts-oc2g/oml_router.h A src/osmo-bts-oc2g/tch.c A src/osmo-bts-oc2g/utils.c A src/osmo-bts-oc2g/utils.h 47 files changed, 12,596 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/11447/1 -- To view, visit https://gerrit.osmocom.org/11447 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I327384fe5ac944dc3996a3f00932d6f1a10d5a35 Gerrit-Change-Number: 11447 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan
Change in osmo-bts[master]: test
Omar Ramadan has abandoned this change. ( https://gerrit.osmocom.org/11392 ) Change subject: test .. Abandoned -- To view, visit https://gerrit.osmocom.org/11392 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-MessageType: abandon Gerrit-Change-Id: I2a94ec78001e36c09b10716820fcf4e73b0dd6e4 Gerrit-Change-Number: 11392 Gerrit-PatchSet: 1 Gerrit-Owner: Omar Ramadan Gerrit-CC: Jenkins Builder (102)
