libosmo-sccp[master]: cosmetic: fixup comment
Patch Set 1: Code-Review-1 (1 comment) https://gerrit.osmocom.org/#/c/3264/1/src/osmo_ss7_vty.c File src/osmo_ss7_vty.c: Line 1198: /* Delet an addressbook entry */ Delete -- To view, visit https://gerrit.osmocom.org/3264 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8ecad584a1bc9b97693b199abd1ec2e5f6ce156d Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] libosmo-sccp[master]: cosmetic: fixup comment
Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3264 to look at the new patch set (#2). cosmetic: fixup comment Change-Id: I8ecad584a1bc9b97693b199abd1ec2e5f6ce156d --- M src/osmo_ss7_vty.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/64/3264/2 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index b06f554..a2f520b 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1195,7 +1195,7 @@ return CMD_SUCCESS; } -/* Create a new addressbook entry and switch nodes */ +/* Delete an addressbook entry */ DEFUN(cs7_sccpaddr_del, cs7_sccpaddr_del_cmd, "no sccp-address NAME", NO_STR "Delete an SCCP addressbook entry\n" "Name of the SCCP Address\n") -- To view, visit https://gerrit.osmocom.org/3264 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I8ecad584a1bc9b97693b199abd1ec2e5f6ce156d Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol
libosmo-sccp[master]: cosmetic: fixup comment
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3264 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8ecad584a1bc9b97693b199abd1ec2e5f6ce156d Gerrit-PatchSet: 2 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] openbsc[master]: gtphob: check for missing result of rate_ctr_group_alloc()
Harald Welte has submitted this change and it was merged. Change subject: gtphob: check for missing result of rate_ctr_group_alloc() .. gtphob: check for missing result of rate_ctr_group_alloc() In case the counter group allocation fails, we must handle this gracefully and fail the allocation of the parent object, too. The recent change (Id I7dad4a4d52fe05f6b990359841b4408df5990e21) seems to have missed one instance, so let's follow-up. Change-Id: I1ee9e3d26dcc18e7f979fd9a786162cbcc50942c Related: OS#2361 --- M openbsc/src/gprs/gtphub.c 1 file changed, 4 insertions(+), 0 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/openbsc/src/gprs/gtphub.c b/openbsc/src/gprs/gtphub.c index 211018b..5e7520e 100644 --- a/openbsc/src/gprs/gtphub.c +++ b/openbsc/src/gprs/gtphub.c @@ -2708,6 +2708,10 @@ pp->counters_io = rate_ctr_group_alloc(osmo_gtphub_ctx, >phub_ctrg_io_desc, 0); + if (!pp->counters_io) { + talloc_free(pp); + return NULL; + } llist_add(&pp->entry, &a->ports); -- To view, visit https://gerrit.osmocom.org/3270 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ee9e3d26dcc18e7f979fd9a786162cbcc50942c Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
openbsc[master]: gtphob: check for missing result of rate_ctr_group_alloc()
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3270 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1ee9e3d26dcc18e7f979fd9a786162cbcc50942c Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Harald Welte Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[PATCH] libosmo-sccp[master]: vty: command to set local ip of ASP
Review at https://gerrit.osmocom.org/3271 vty: command to set local ip of ASP The local ip of an ASP can not be set, while the same is possible for the remote ip. Add VTY command to set the local ip of an ASP Change-Id: I115b87b08bdc4b07772b7afb9c25bc713e79945a --- M src/osmo_ss7_vty.c 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/71/3271/1 diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index b06f554..e79ca20 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -563,6 +563,16 @@ return CMD_SUCCESS; } +DEFUN(asp_local_ip, asp_local_ip_cmd, + "local-ip A.B.C.D", + "Specify Local IP Address of ASP\n" + "Local IP Address of ASP\n") +{ + struct osmo_ss7_asp *asp = vty->index; + osmo_talloc_replace_string(asp, &asp->cfg.local.host, argv[0]); + return CMD_SUCCESS; +} + DEFUN(asp_qos_clas, asp_qos_class_cmd, "qos-class <0-255>", "Specify QoS Class of ASP\n" @@ -1611,6 +1621,7 @@ install_element(L_CS7_NODE, &no_cs7_asp_cmd); install_element(L_CS7_ASP_NODE, &cfg_description_cmd); install_element(L_CS7_ASP_NODE, &asp_remote_ip_cmd); + install_element(L_CS7_ASP_NODE, &asp_local_ip_cmd); install_element(L_CS7_ASP_NODE, &asp_qos_class_cmd); install_element(L_CS7_ASP_NODE, &asp_block_cmd); install_element(L_CS7_ASP_NODE, &asp_shutdown_cmd); -- To view, visit https://gerrit.osmocom.org/3271 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I115b87b08bdc4b07772b7afb9c25bc713e79945a Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter
libosmocore[master]: add DLMGCP logging category for libosmo-mgcp
Patch Set 2: > I really would prefer not to have a system-installed library with a > "stable" API for MGCP based on the existing code. The alternative is to copy the previous internal libmgcp around. We would have copies in osmo-mgw, osmo-msc and osmo-bsc. osmo-msc uses MGCP client code that is separate from the main MGCP-GW implementation. Moving the MGCP client code to osmo-msc is still fairly reasonable. But when we want to also couple an MGCP-GW with each BSC, we also need that same code in osmo-bsc. osmo-bsc_nat is so far in osmo-bsc.git and makes extensive use of the libmgcp code. Copying that would be a large bit of code dup between osmo-mgw.git and osmo-bsc.git. Does it make sense to move osmo-bsc_nat to osmo-mgw.git?? I guess not, given the shared code with osmo-bsc. So far I tend to like having a separate library for X to avoid code dup, and you seem to be rather opposed to exposing API. We need to agree on a strategy. Are we really forced to keep the APIs "stable"? If yes, does it really hurt that much to do so? Is code dup less trouble? -- To view, visit https://gerrit.osmocom.org/3181 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I09c587e2d59472cbde852d467d457254746d9e67 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[PATCH] osmo-bts[master]: lc15: cleanup board parameters reading
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3268 to look at the new patch set (#2). lc15: cleanup board parameters reading * move common code into separate function * print error similar to parameter reading code Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87 Related: SYS#3728 --- M src/osmo-bts-litecell15/misc/lc15bts_bid.c 1 file changed, 25 insertions(+), 22 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/68/3268/2 diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index 06a126a..ba2037a 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -24,12 +24,13 @@ #include #include #include +#include #include "lc15bts_bid.h" #define BOARD_REV_SYSFS"/var/lc15/platform/revision" #define BOARD_OPT_SYSFS"/var/lc15/platform/option" - + static const int option_type_mask[_NUM_OPTION_TYPES] = { [LC15BTS_OPTION_OCXO] = 0x07, [LC15BTS_OPTION_FPGA] = 0x03, @@ -72,6 +73,21 @@ static int board_rev = -1; static int board_option = -1; +static inline bool read_board(const char *src, const char *spec, void *dst) +{ + FILE *fp = fopen(src, "r"); +if (!fp) { + fprintf(stderr, "Failed to open %s due to '%s' error\n", src, strerror(errno)); + return false; + } + +if (fscanf(fp, spec, dst) != 1) { +fclose(fp); + fprintf(stderr, "Failed to read %s due to '%s' error\n", src, strerror(errno)); + return false; +} +fclose(fp); +} int lc15bts_rev_get(void) { @@ -82,14 +98,8 @@ return board_rev; } -fp = fopen(BOARD_REV_SYSFS, "r"); -if (fp == NULL) return -1; - -if (fscanf(fp, "%c", &rev) != 1) { -fclose( fp ); -return -1; -} -fclose(fp); + if (!read_board(BOARD_REV_SYSFS, "%c", &rev)) + return -1; board_rev = rev; return board_rev; @@ -99,22 +109,15 @@ { FILE *fp; int opt; + bool rc; +if (board_option != -1) + return board_option; -if (board_option == -1) { - fp = fopen(BOARD_OPT_SYSFS, "r"); - if (fp == NULL) { - return -1; - } - - if (fscanf(fp, "%X", &opt) != 1) { - fclose( fp ); - return -1; - } - fclose(fp); + if (!read_board(BOARD_OPT_SYSFS, "%X", &opt)) + return -1; - board_option = opt; - } + board_option = opt; return board_option; } -- To view, visit https://gerrit.osmocom.org/3268 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
[PATCH] osmo-bts[master]: lc15-mgr: update parameter write
Review at https://gerrit.osmocom.org/3272 lc15-mgr: update parameter write Better match upstream lc15 code: * fsync on parameter write * use runtime dir for parameter storage Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Related: SYS#3728 --- M contrib/sysmobts-mgr.service M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h 3 files changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/3272/1 diff --git a/contrib/sysmobts-mgr.service b/contrib/sysmobts-mgr.service index 182e306..f5e244e 100644 --- a/contrib/sysmobts-mgr.service +++ b/contrib/sysmobts-mgr.service @@ -9,4 +9,3 @@ [Install] WantedBy=multi-user.target - diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.c b/src/osmo-bts-litecell15/misc/lc15bts_par.c index ab3e96b..13b0080 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.c @@ -130,6 +130,8 @@ fclose(fp); return -EIO; } + + fsync(fp); fclose(fp); return 0; } @@ -161,6 +163,7 @@ rc = fwrite(buf, 1, size, fp); +fsync(fp); fclose(fp); return rc; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.h b/src/osmo-bts-litecell15/misc/lc15bts_par.h index b9fe740..dd869d3 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.h +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.h @@ -4,7 +4,7 @@ #include #define FACTORY_ROM_PATH "/mnt/rom/factory" -#define USER_ROM_PATH "/mnt/rom/user" +#define USER_ROM_PATH "/mnt/storage/var/run/lc15bts-mgr" enum lc15bts_par { LC15BTS_PAR_TEMP_SUPPLY_MAX, -- To view, visit https://gerrit.osmocom.org/3272 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max
[PATCH] osmo-bts[master]: lc15-mgr: update parameter read/write
lc15-mgr: update parameter read/write Better match upstream lc15 code: * fsync on parameter write * use permanent storage directly for parameters Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Related: SYS#3728 --- M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/72/3272/2 diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.c b/src/osmo-bts-litecell15/misc/lc15bts_par.c index ab3e96b..13b0080 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.c @@ -130,6 +130,8 @@ fclose(fp); return -EIO; } + + fsync(fp); fclose(fp); return 0; } @@ -161,6 +163,7 @@ rc = fwrite(buf, 1, size, fp); +fsync(fp); fclose(fp); return rc; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.h b/src/osmo-bts-litecell15/misc/lc15bts_par.h index b9fe740..dd869d3 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.h +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.h @@ -4,7 +4,7 @@ #include #define FACTORY_ROM_PATH "/mnt/rom/factory" -#define USER_ROM_PATH "/mnt/rom/user" +#define USER_ROM_PATH "/mnt/storage/var/run/lc15bts-mgr" enum lc15bts_par { LC15BTS_PAR_TEMP_SUPPLY_MAX, -- To view, visit https://gerrit.osmocom.org/3272 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Jenkins Builder
osmo-bts[master]: lc15-mgr: update parameter read/write
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3272 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: Unify *.service files
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3267 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia067dc5b0bdef07b90ab57f89e8ba6b2a794eb4a Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-bts[master]: lc15: cleanup board parameters reading
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3268 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-bts[master]: lc15-mgr: update parameter read/write
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/3272/2//COMMIT_MSG Commit Message: Line 9: Better match upstream lc15 code: actually, it's not uptream. we are upstream. We match close r to the vendor fork from of a vendor who doesn't seem to care to merge his changes upstream :/ -- To view, visit https://gerrit.osmocom.org/3272 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-HasComments: Yes
[MERGED] osmo-bts[master]: lc15: cleanup board parameters reading
Max has submitted this change and it was merged. Change subject: lc15: cleanup board parameters reading .. lc15: cleanup board parameters reading * move common code into separate function * print error similar to parameter reading code Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87 Related: SYS#3728 --- M src/osmo-bts-litecell15/misc/lc15bts_bid.c 1 file changed, 25 insertions(+), 22 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index 06a126a..ba2037a 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -24,12 +24,13 @@ #include #include #include +#include #include "lc15bts_bid.h" #define BOARD_REV_SYSFS"/var/lc15/platform/revision" #define BOARD_OPT_SYSFS"/var/lc15/platform/option" - + static const int option_type_mask[_NUM_OPTION_TYPES] = { [LC15BTS_OPTION_OCXO] = 0x07, [LC15BTS_OPTION_FPGA] = 0x03, @@ -72,6 +73,21 @@ static int board_rev = -1; static int board_option = -1; +static inline bool read_board(const char *src, const char *spec, void *dst) +{ + FILE *fp = fopen(src, "r"); +if (!fp) { + fprintf(stderr, "Failed to open %s due to '%s' error\n", src, strerror(errno)); + return false; + } + +if (fscanf(fp, spec, dst) != 1) { +fclose(fp); + fprintf(stderr, "Failed to read %s due to '%s' error\n", src, strerror(errno)); + return false; +} +fclose(fp); +} int lc15bts_rev_get(void) { @@ -82,14 +98,8 @@ return board_rev; } -fp = fopen(BOARD_REV_SYSFS, "r"); -if (fp == NULL) return -1; - -if (fscanf(fp, "%c", &rev) != 1) { -fclose( fp ); -return -1; -} -fclose(fp); + if (!read_board(BOARD_REV_SYSFS, "%c", &rev)) + return -1; board_rev = rev; return board_rev; @@ -99,22 +109,15 @@ { FILE *fp; int opt; + bool rc; +if (board_option != -1) + return board_option; -if (board_option == -1) { - fp = fopen(BOARD_OPT_SYSFS, "r"); - if (fp == NULL) { - return -1; - } - - if (fscanf(fp, "%X", &opt) != 1) { - fclose( fp ); - return -1; - } - fclose(fp); + if (!read_board(BOARD_OPT_SYSFS, "%X", &opt)) + return -1; - board_option = opt; - } + board_option = opt; return board_option; } -- To view, visit https://gerrit.osmocom.org/3268 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icf3285d7bb921d212cb8945e835be2c81189fb87 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max
osmo-bts[master]: lc15: add trx-calibration to example config
Patch Set 1: Note: we use this as a default config for corresponding image. -- To view, visit https://gerrit.osmocom.org/3252 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: No
[MERGED] osmo-bts[master]: Unify *.service files
Max has submitted this change and it was merged. Change subject: Unify *.service files .. Unify *.service files * unify description * provide common BTS-independent aliases Change-Id: Ia067dc5b0bdef07b90ab57f89e8ba6b2a794eb4a --- M contrib/osmo-bts-lc15.service M contrib/osmo-bts-sysmo.service M contrib/sysmobts-mgr.service 3 files changed, 5 insertions(+), 3 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/contrib/osmo-bts-lc15.service b/contrib/osmo-bts-lc15.service index a30d50f..ab7def8 100644 --- a/contrib/osmo-bts-lc15.service +++ b/contrib/osmo-bts-lc15.service @@ -18,3 +18,4 @@ [Install] WantedBy=multi-user.target +Alias=osmo-bts.service diff --git a/contrib/osmo-bts-sysmo.service b/contrib/osmo-bts-sysmo.service index bbb2bef..65b1f00 100644 --- a/contrib/osmo-bts-sysmo.service +++ b/contrib/osmo-bts-sysmo.service @@ -1,5 +1,5 @@ [Unit] -Description=sysmocom sysmoBTS +Description=osmo-bts for sysmocom sysmoBTS [Service] Type=simple @@ -18,3 +18,4 @@ [Install] WantedBy=multi-user.target Alias=sysmobts.service +Alias=osmo-bts.service diff --git a/contrib/sysmobts-mgr.service b/contrib/sysmobts-mgr.service index 182e306..151c821 100644 --- a/contrib/sysmobts-mgr.service +++ b/contrib/sysmobts-mgr.service @@ -1,5 +1,5 @@ [Unit] -Description=sysmocom %p manager +Description=osmo-bts manager for %p [Service] Type=simple @@ -9,4 +9,4 @@ [Install] WantedBy=multi-user.target - +Alias=osmo-bts-mgr.service -- To view, visit https://gerrit.osmocom.org/3267 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia067dc5b0bdef07b90ab57f89e8ba6b2a794eb4a Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
libosmo-sccp[master]: vty: command to set local ip of ASP
Patch Set 1: please clarify when/how this is used. The existing VTY interface is designed to be compatible with the Cisco ITP. The specification of the local IP address (on a SG/STP) is done at the time you bind the given M3UA or SUA listener process, see xua_local_ip_cmd Is this command intended to be used in ASP-client mode? If yes, please state it here. Also, it probably would not work in SG/STP mode, so we should make sure not to offer/install it in that case? -- To view, visit https://gerrit.osmocom.org/3271 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I115b87b08bdc4b07772b7afb9c25bc713e79945a Gerrit-PatchSet: 1 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
osmo-gsm-manuals[master]: osmo-gsm-tester: jenkins fixes: install JDK, SSH instructions
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3266 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib2c1adc2ddee3be016e4d253451593b19dbe133a Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
libosmo-sccp[master]: vty: make addressbook available for _sg and _asp
Patch Set 5: waiting for neels to see if his comments are adressed. The global list for globally unique name lookup will be a separate patch, or what is the plan here? -- To view, visit https://gerrit.osmocom.org/3103 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb Gerrit-PatchSet: 5 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-gsm-manuals[master]: osmo-gsm-tester: jenkins fixes: install JDK, SSH instructions
Harald Welte has submitted this change and it was merged. Change subject: osmo-gsm-tester: jenkins fixes: install JDK, SSH instructions .. osmo-gsm-tester: jenkins fixes: install JDK, SSH instructions Add instructions to install Java JDK for jenkins build slave. Minor fixes to SSH key instructions. Change-Id: Ib2c1adc2ddee3be016e4d253451593b19dbe133a --- M OsmoGSMTester/chapters/install.adoc 1 file changed, 11 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoGSMTester/chapters/install.adoc b/OsmoGSMTester/chapters/install.adoc index b703498..0c69dcd 100644 --- a/OsmoGSMTester/chapters/install.adoc +++ b/OsmoGSMTester/chapters/install.adoc @@ -64,6 +64,15 @@ useradd -m jenkins + Install Java on Main Unit + +To be able to launch the Jenkins build slave, a Java RE must be available on +the main unit. For example: + + +apt-get install default-jdk + + Allow SSH Access from Jenkins Master Create an SSH keypair to be used for login on the osmo-gsm-tester. This may be @@ -73,6 +82,7 @@ # su jenkins +$ mkdir -p /usr/local/jenkins/keys $ ssh-keygen Generating public/private rsa key pair. Enter file in which to save the key (/home/jenkins/.ssh/id_rsa): /usr/local/jenkins/keys/osmo-gsm-tester-rnd @@ -122,7 +132,7 @@ su jenkins main_unit_ip=10.9.8.7 -ssh jenkins@$main_unit_ip +ssh -i /usr/local/jenkins/keys/osmo-gsm-tester-rnd jenkins@$main_unit_ip exit -- To view, visit https://gerrit.osmocom.org/3266 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib2c1adc2ddee3be016e4d253451593b19dbe133a Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmo-sccp[master]: vty: make addressbook available for _sg and _asp
Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3103 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib49ab623055e9ada7f95e0163ba7e33c5f6f99cb Gerrit-PatchSet: 5 Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Owner: dexter Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: No
[MERGED] osmo-bts[master]: lc15-mgr: update parameter read/write
Max has submitted this change and it was merged. Change subject: lc15-mgr: update parameter read/write .. lc15-mgr: update parameter read/write Better match upstream lc15 code: * fsync on parameter write * use permanent storage directly for parameters Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Related: SYS#3728 --- M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h 2 files changed, 4 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.c b/src/osmo-bts-litecell15/misc/lc15bts_par.c index ab3e96b..13b0080 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.c @@ -130,6 +130,8 @@ fclose(fp); return -EIO; } + + fsync(fp); fclose(fp); return 0; } @@ -161,6 +163,7 @@ rc = fwrite(buf, 1, size, fp); +fsync(fp); fclose(fp); return rc; diff --git a/src/osmo-bts-litecell15/misc/lc15bts_par.h b/src/osmo-bts-litecell15/misc/lc15bts_par.h index b9fe740..dd869d3 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_par.h +++ b/src/osmo-bts-litecell15/misc/lc15bts_par.h @@ -4,7 +4,7 @@ #include #define FACTORY_ROM_PATH "/mnt/rom/factory" -#define USER_ROM_PATH "/mnt/rom/user" +#define USER_ROM_PATH "/mnt/storage/var/run/lc15bts-mgr" enum lc15bts_par { LC15BTS_PAR_TEMP_SUPPLY_MAX, -- To view, visit https://gerrit.osmocom.org/3272 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iac150bf2ebffc5fa9544b0f3b19cd647996fc8b6 Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Minh-Quang Nguyen
[PATCH] osmo-gsm-manuals[master]: rtp-amr: Describe requirement to recieve all PH-DATA.ind events
Review at https://gerrit.osmocom.org/3273 rtp-amr: Describe requirement to recieve all PH-DATA.ind events Change-Id: I4a78b3398c36a8107fa1809ba9b89235980f0e4f --- M OsmoBTS/rtp-amr-docinfo.xml M OsmoBTS/rtp-amr.adoc 2 files changed, 59 insertions(+), 35 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/73/3273/1 diff --git a/OsmoBTS/rtp-amr-docinfo.xml b/OsmoBTS/rtp-amr-docinfo.xml index fe5d681..3f4de8d 100644 --- a/OsmoBTS/rtp-amr-docinfo.xml +++ b/OsmoBTS/rtp-amr-docinfo.xml @@ -15,6 +15,14 @@ FSM added + +3 +July 2017 +PE + + Add section and update sequence charts to describe requirement to receive all PH-DATA.ind events + + diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 982a5af..5f0f803 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -14,6 +14,22 @@ === TCH/AFS Uplink (MS to Network) + TCH/AFS Uplink: Initial Assumptions + +When a call is established, the BTS expects PH-DATA.ind (TCH) events to be +triggered by BTS-PHY at regular intervals and none of them being lost, even if +the MS is not transmitting at that time due to DTX. This requirement is +important as upper layers rely on this timing to update the RTP source clock at +a correct pace. Given an event from BTS-PHY is lost, the RTP source clock will +drift and this may be seen as steady increase of delay over time from the +receiver point of view. + +In the case of Nutaq GSM PHY and API, option fBFILevel is set to a ridiculously +low value -200 to ensure all indications are notified to upper layers, even if +no meaningful payload is available at that time. In this case, an empty payload +is delivered from PHY-BTS to BTS, which updates the clock without sending any +RTP packet. + TCH/AFS Uplink: During Talk-Spurt During a talk-spurt, the system behaves identical to a system without @@ -83,14 +99,14 @@ ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms => phy [label="L1 burst (sub-block 1+2 of SID_UPDATE)", id="ULSU2"]; ms => phy [label="L1 burst (sub-block 3+4 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 5+6 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 7+8 of SID_UPDATE)"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -133,7 +149,7 @@ ms => phy [label="L1 burst (sub-block 3+4 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 5+6 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 7+8 of SID_UPDATE)"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; @@ -147,49 +163,49 @@ ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms
[PATCH] osmo-gsm-manuals[master]: rtp-amr: Fix typo and trailing whitespace
Review at https://gerrit.osmocom.org/3274 rtp-amr: Fix typo and trailing whitespace Change-Id: I8efda2387e0e5e95700b070dab8f8dd427fa562d --- M OsmoBTS/rtp-amr.adoc 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/74/3274/1 diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 5f0f803..4da2e1b 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -1,7 +1,7 @@ = AMR-RTP in Combination with DTX The purpose of this document is to describe the sometimes quite -intricate interactions between a MS, the BTS-PHY and the BTS softare +intricate interactions between a MS, the BTS-PHY and the BTS software in case of AMR (Adaptive Multi Rate) codec and DTX (Discontinuous Transmission). @@ -760,7 +760,7 @@ } -ULSF1:: Only SID_FIRST_P1 contains information so it must be the only one transmitted over RTP. +ULSF1:: Only SID_FIRST_P1 contains information so it must be the only one transmitted over RTP. NOTE:: It has been observed that not all phones transmit SID_FIRST_P2 so the PH-DATA.ind GsmL1_TchPlType_Amr_SidFirstP2 is not guaranteed to be sent to the BTS. -- To view, visit https://gerrit.osmocom.org/3274 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8efda2387e0e5e95700b070dab8f8dd427fa562d Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
osmo-gsm-manuals[master]: rtp-amr: Describe requirement to recieve all PH-DATA.ind events
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3273/1/OsmoBTS/rtp-amr.adoc File OsmoBTS/rtp-amr.adoc: Line 27: In the case of Nutaq GSM PHY and API, option fBFILevel is set to a ridiculously I think it's better to refer to BTS models explicitly instead of company name as it's less confusing. -- To view, visit https://gerrit.osmocom.org/3273 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4a78b3398c36a8107fa1809ba9b89235980f0e4f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-HasComments: Yes
osmo-gsm-manuals[master]: rtp-amr: Describe requirement to recieve all PH-DATA.ind events
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3273/1/OsmoBTS/rtp-amr.adoc File OsmoBTS/rtp-amr.adoc: Line 27: In the case of Nutaq GSM PHY and API, option fBFILevel is set to a ridiculously > I think it's better to refer to BTS models explicitly instead of company na I'm using this here because these terms are already being used 2 paragraphs above, in order to show I'm talking about the same example: "It is written with the OsmoBTS implementation and the Nutaq GSM PHY API in mind, but should more or less be applicable to any GSM BTS PHY or any BTS software implementation, assuming it uses RTP on the back-haul towards the MGW." -- To view, visit https://gerrit.osmocom.org/3273 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4a78b3398c36a8107fa1809ba9b89235980f0e4f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
osmo-gsm-tester[master]: Improve SMPP supported features and test coverage
Patch Set 3: Code-Review-1 (5 comments) marking -1 for some of the comments; Really close to a +2. https://gerrit.osmocom.org/#/c/3129/3/src/osmo_gsm_tester/esme.py File src/osmo_gsm_tester/esme.py: Line 98: lambda pdu: self.dbg('message sent unhandled resp:', pdu.sequence) ) clarify ... "message we are sending contains an unhandled response"? can't figure out what this means. Line 116: def message_received_handler(self, pdu, *args): might be good to indicate that this is not part of the intended testing API but an internal handler, by prepending an underscore to the name? Line 126: self.log('FIXME: wait_receipt disabled because receipts are not received, see OsmoNITB #2353') hmm, we don't have an expected-to-fail mechanism yet. this would qualify to be an xfail... Line 166: def process_pdus_pending(self, pdu, **kwargs): public API or internal? https://gerrit.osmocom.org/#/c/3129/3/suites/aoip_smpp/esme_ms_sms_storeforward.py File suites/aoip_smpp/esme_ms_sms_storeforward.py: Line 52: wait(esme.receipt_was_received, umref) ...like with xfail: wait(emse.receipt_was_received, umref, timeout=30) but we don't have an xfail yet. Generally we will often need an xfail of sorts. Not necessarily in this patch, just thinking because it's the first time this shows up. -- To view, visit https://gerrit.osmocom.org/3129 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ia2c0c325fee14143deca8310312fc530cd9ce92e Gerrit-PatchSet: 3 Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
osmo-gsm-manuals[master]: rtp-amr: Describe requirement to recieve all PH-DATA.ind events
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3273 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4a78b3398c36a8107fa1809ba9b89235980f0e4f Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-gsm-manuals[master]: rtp-amr: Fix typo and trailing whitespace
Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3274 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I8efda2387e0e5e95700b070dab8f8dd427fa562d Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-HasComments: No
[MERGED] osmo-gsm-manuals[master]: rtp-amr: Describe requirement to recieve all PH-DATA.ind events
Harald Welte has submitted this change and it was merged. Change subject: rtp-amr: Describe requirement to recieve all PH-DATA.ind events .. rtp-amr: Describe requirement to recieve all PH-DATA.ind events Change-Id: I4a78b3398c36a8107fa1809ba9b89235980f0e4f --- M OsmoBTS/rtp-amr-docinfo.xml M OsmoBTS/rtp-amr.adoc 2 files changed, 59 insertions(+), 35 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBTS/rtp-amr-docinfo.xml b/OsmoBTS/rtp-amr-docinfo.xml index fe5d681..3f4de8d 100644 --- a/OsmoBTS/rtp-amr-docinfo.xml +++ b/OsmoBTS/rtp-amr-docinfo.xml @@ -15,6 +15,14 @@ FSM added + +3 +July 2017 +PE + + Add section and update sequence charts to describe requirement to receive all PH-DATA.ind events + + diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 982a5af..5f0f803 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -14,6 +14,22 @@ === TCH/AFS Uplink (MS to Network) + TCH/AFS Uplink: Initial Assumptions + +When a call is established, the BTS expects PH-DATA.ind (TCH) events to be +triggered by BTS-PHY at regular intervals and none of them being lost, even if +the MS is not transmitting at that time due to DTX. This requirement is +important as upper layers rely on this timing to update the RTP source clock at +a correct pace. Given an event from BTS-PHY is lost, the RTP source clock will +drift and this may be seen as steady increase of delay over time from the +receiver point of view. + +In the case of Nutaq GSM PHY and API, option fBFILevel is set to a ridiculously +low value -200 to ensure all indications are notified to upper layers, even if +no meaningful payload is available at that time. In this case, an empty payload +is delivered from PHY-BTS to BTS, which updates the clock without sending any +RTP packet. + TCH/AFS Uplink: During Talk-Spurt During a talk-spurt, the system behaves identical to a system without @@ -83,14 +99,14 @@ ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms => phy [label="L1 burst (sub-block 1+2 of SID_UPDATE)", id="ULSU2"]; ms => phy [label="L1 burst (sub-block 3+4 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 5+6 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 7+8 of SID_UPDATE)"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; @@ -133,7 +149,7 @@ ms => phy [label="L1 burst (sub-block 3+4 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 5+6 of SID_UPDATE)"]; ms => phy [label="L1 burst (sub-block 7+8 of SID_UPDATE)"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; @@ -147,49 +163,49 @@ ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; ms -x phy [label="Supressed L1 burst"]; - phy -x bts [label="No PH-DATA.ind sent[BFI]"]; + phy => bts [label="PH-DATA.ind with empty payload"]; bts -x mgw [label="Suppressed RTP frame"];
libosmocore[master]: add DLMGCP logging category for libosmo-mgcp
Patch Set 2: We've talked with the result that we're going to have an libosmo-mgcp-legacy library clearly marked as such, to keep the namespace open for new development of the osmo-mgw. I still need a logging category for it = I'd still like to add this DLMGCP category. -- To view, visit https://gerrit.osmocom.org/3181 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I09c587e2d59472cbde852d467d457254746d9e67 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[MERGED] osmo-gsm-manuals[master]: rtp-amr: Fix typo and trailing whitespace
Harald Welte has submitted this change and it was merged. Change subject: rtp-amr: Fix typo and trailing whitespace .. rtp-amr: Fix typo and trailing whitespace Change-Id: I8efda2387e0e5e95700b070dab8f8dd427fa562d --- M OsmoBTS/rtp-amr.adoc 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/OsmoBTS/rtp-amr.adoc b/OsmoBTS/rtp-amr.adoc index 5f0f803..4da2e1b 100644 --- a/OsmoBTS/rtp-amr.adoc +++ b/OsmoBTS/rtp-amr.adoc @@ -1,7 +1,7 @@ = AMR-RTP in Combination with DTX The purpose of this document is to describe the sometimes quite -intricate interactions between a MS, the BTS-PHY and the BTS softare +intricate interactions between a MS, the BTS-PHY and the BTS software in case of AMR (Adaptive Multi Rate) codec and DTX (Discontinuous Transmission). @@ -760,7 +760,7 @@ } -ULSF1:: Only SID_FIRST_P1 contains information so it must be the only one transmitted over RTP. +ULSF1:: Only SID_FIRST_P1 contains information so it must be the only one transmitted over RTP. NOTE:: It has been observed that not all phones transmit SID_FIRST_P2 so the PH-DATA.ind GsmL1_TchPlType_Amr_SidFirstP2 is not guaranteed to be sent to the BTS. -- To view, visit https://gerrit.osmocom.org/3274 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8efda2387e0e5e95700b070dab8f8dd427fa562d Gerrit-PatchSet: 2 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder
libosmocore[master]: add DLMGCP logging category for libosmo-mgcp
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3181 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I09c587e2d59472cbde852d467d457254746d9e67 Gerrit-PatchSet: 2 Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: Vadim Yanitskiy Gerrit-HasComments: No
[PATCH] osmo-bts[master]: lc15: fix BTS revision and hw options
Review at https://gerrit.osmocom.org/3275 lc15: fix BTS revision and hw options * remove typo in logging * add missing return statement * fix compilation warnings * add detailed logging for supported GSM band and related errors Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Related: SYS#3728 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c 2 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/3275/1 diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index b82a7c6..3f42624 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -1369,7 +1369,7 @@ fl1h->hw_info.fpga_version[1] = sic->fpgaVersion.minor; fl1h->hw_info.fpga_version[2] = sic->fpgaVersion.build; - LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\nn", + LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\n", sic->dspVersion.major, sic->dspVersion.minor, sic->dspVersion.build, sic->fpgaVersion.major, sic->fpgaVersion.minor, sic->fpgaVersion.build); @@ -1468,18 +1468,24 @@ int rc; rc = lc15bts_rev_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS revision: %d\n", rc); return rc; + } fl1h->hw_info.ver_major = rc; rc = lc15bts_model_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS model: %d\n", rc); return rc; + } fl1h->hw_info.ver_minor = rc; rc = lc15bts_option_get(LC15BTS_OPTION_BAND); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS_OPTION_BAND: %d\n", rc); return rc; + } switch (rc) { case LC15BTS_BAND_850: @@ -1495,8 +1501,12 @@ fl1h->hw_info.band_support = GSM_BAND_1900; break; default: + LOGP(DL1C, LOGL_ERROR, "Unexpected LC15BTS_BAND value: %d\n", rc); return -1; } + + LOGP(DL1C, LOGL_DEBUG, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); + return 0; } diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index ba2037a..7f278bf 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -87,11 +87,11 @@ return false; } fclose(fp); + return true; } int lc15bts_rev_get(void) { - FILE *fp; char rev; if (board_rev != -1) { @@ -107,9 +107,7 @@ int lc15bts_model_get(void) { -FILE *fp; int opt; - bool rc; if (board_option != -1) return board_option; -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max
[PATCH] osmo-gsm-manuals[master]: all manuals: Move date and release from center head to right...
Review at https://gerrit.osmocom.org/3276 all manuals: Move date and release from center head to right foot Otherwise long doc titles (top left) run on top of release and date making it impossible to read any of them correctly. Change-Id: I685a981a5cfd82214d1d654aa1553a844c2af157 --- M build/custom-dblatex.sty 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-manuals refs/changes/76/3276/1 diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty index 41e7c70..606b9ab 100644 --- a/build/custom-dblatex.sty +++ b/build/custom-dblatex.sty @@ -77,7 +77,8 @@ % left footer \def\DBKpublisher{} -\def\releasebox{\DBKreleaseinfo, \DBKdate} +\def\releasebox{} +\rfoot[]{\DBKreleaseinfo, \DBKdate} \def\maketitle{ \DBKcover -- To view, visit https://gerrit.osmocom.org/3276 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I685a981a5cfd82214d1d654aa1553a844c2af157 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol
osmo-gsm-manuals[master]: all manuals: Move date and release from center head to right...
Patch Set 1: Next nice change would be to swap places of right foot (release+date) with right header (page number). However, I spent some time trying to find how to replace the content of the right header (with \rhead and similar) but I was unable to change it. -- To view, visit https://gerrit.osmocom.org/3276 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I685a981a5cfd82214d1d654aa1553a844c2af157 Gerrit-PatchSet: 1 Gerrit-Project: osmo-gsm-manuals Gerrit-Branch: master Gerrit-Owner: Pau Espin Pedrol Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-bts[master]: lc15: fix BTS revision and hw options
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3275/1/src/osmo-bts-litecell15/l1_if.c File src/osmo-bts-litecell15/l1_if.c: Line 1508: LOGP(DL1C, LOGL_DEBUG, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); If it's not called that often, it's probably a good idea to use INFO level. Also print then the other options you are fetching here. Maybe create a function to print the fl1h structure? -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] osmo-bts[master]: lc15: port lc15bts-mgr changes
Review at https://gerrit.osmocom.org/3277 lc15: port lc15bts-mgr changes Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Related: SYS#3679 --- M doc/examples/litecell15/lc15bts-mgr.cfg M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/osmo-bts-litecell15/Makefile.am M src/osmo-bts-litecell15/hw_misc.c A src/osmo-bts-litecell15/misc/lc15bts_bts.c A src/osmo-bts-litecell15/misc/lc15bts_bts.h M src/osmo-bts-litecell15/misc/lc15bts_clock.c A src/osmo-bts-litecell15/misc/lc15bts_led.c A src/osmo-bts-litecell15/misc/lc15bts_led.h M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-litecell15/misc/lc15bts_misc.c M src/osmo-bts-litecell15/misc/lc15bts_misc.h M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_power.h M src/osmo-bts-litecell15/misc/lc15bts_temp.c M src/osmo-bts-litecell15/misc/lc15bts_temp.h 22 files changed, 2,013 insertions(+), 410 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/3277/1 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index 750dc36..c7d0a79 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -25,39 +25,19 @@ no login ! lc15bts-mgr - limits supply - threshold warning 60 - threshold critical 78 - limits soc - threshold warning 60 - threshold critical 78 - limits fpga - threshold warning 60 - threshold critical 78 - limits logrf - threshold warning 60 - threshold critical 78 - limits tx0 - threshold warning 60 - threshold critical 78 - limits tx1 - threshold warning 60 - threshold critical 78 - limits pa0 - threshold warning 60 - threshold critical 78 - limits pa1 - threshold warning 60 - threshold critical 78 - actions normal - pa0-on - pa1-on - bts-service-on - actions warn - no pa0-off - no pa1-off - no bts-service-off - actions critical - pa0-off - pa1-off - no bts-service-off + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits tx0_vswr + threshold warning max 3 + limits tx1_vswr + threshold warning max 3 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 + limits pa0_pwr + threshold warning max 50 + threshold critical max 60 + limits pa1_pwr + threshold warning max 50 + threshold critical max 60 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index d8d3c6b..3d4bf91 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -124,6 +124,12 @@ int minTxPower; int maxTxPower; struct lc15l1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t diversity_mode; /* 0: SISO A, 1: SISO B, 2: MRC */ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + 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; } u; }; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dd368d0..d104c48 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,6 +2,10 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) +if ENABLE_LC15BTS +AM_CFLAGS += -DENABLE_LC15BTS +endif + noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 3026e96..7920df4 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -4,7 +4,9 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) -EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h \ +AM_CFLAGS += -DENABLE_LC15BTS + +EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h misc/lc15bts_led.h \ misc/lc15bts
osmo-bts[master]: lc15: fix BTS revision and hw options
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3275/1/src/osmo-bts-litecell15/l1_if.c File src/osmo-bts-litecell15/l1_if.c: Line 1508: LOGP(DL1C, LOGL_DEBUG, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); > If it's not called that often, it's probably a good idea to use INFO level. dsp and fpga version are already printed by other code. Or what do you have in mind? -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] osmo-bts[master]: lc15: fix BTS revision and hw options
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3275 to look at the new patch set (#2). lc15: fix BTS revision and hw options * remove typo in logging * add missing return statement * fix compilation warnings * add detailed logging for supported GSM band and related errors Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Related: SYS#3728 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c 2 files changed, 15 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/75/3275/2 diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index b82a7c6..cb3efab 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -1369,7 +1369,7 @@ fl1h->hw_info.fpga_version[1] = sic->fpgaVersion.minor; fl1h->hw_info.fpga_version[2] = sic->fpgaVersion.build; - LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\nn", + LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\n", sic->dspVersion.major, sic->dspVersion.minor, sic->dspVersion.build, sic->fpgaVersion.major, sic->fpgaVersion.minor, sic->fpgaVersion.build); @@ -1468,18 +1468,24 @@ int rc; rc = lc15bts_rev_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS revision: %d\n", rc); return rc; + } fl1h->hw_info.ver_major = rc; rc = lc15bts_model_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS model: %d\n", rc); return rc; + } fl1h->hw_info.ver_minor = rc; rc = lc15bts_option_get(LC15BTS_OPTION_BAND); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS_OPTION_BAND: %d\n", rc); return rc; + } switch (rc) { case LC15BTS_BAND_850: @@ -1495,8 +1501,12 @@ fl1h->hw_info.band_support = GSM_BAND_1900; break; default: + LOGP(DL1C, LOGL_ERROR, "Unexpected LC15BTS_BAND value: %d\n", rc); return -1; } + + LOGP(DL1C, LOGL_INFO, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); + return 0; } diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index ba2037a..7f278bf 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -87,11 +87,11 @@ return false; } fclose(fp); + return true; } int lc15bts_rev_get(void) { - FILE *fp; char rev; if (board_rev != -1) { @@ -107,9 +107,7 @@ int lc15bts_model_get(void) { -FILE *fp; int opt; - bool rc; if (board_option != -1) return board_option; -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
osmo-bts[master]: lc15: fix BTS revision and hw options
Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/3275/1/src/osmo-bts-litecell15/l1_if.c File src/osmo-bts-litecell15/l1_if.c: Line 1508: LOGP(DL1C, LOGL_DEBUG, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); > dsp and fpga version are already printed by other code. Or what do you have Does it make sense to print BAND in the same place as the others then? As all this info seems to come from the same place, it would make sense to print it together, but otherwise it's fine. Change it to INFO then :) -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: Yes
[PATCH] osmo-bts[master]: lc15: port lc15bts-mgr changes
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3277 to look at the new patch set (#2). lc15: port lc15bts-mgr changes Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Related: SYS#3679 --- M doc/examples/litecell15/lc15bts-mgr.cfg M include/osmo-bts/phy_link.h M src/common/Makefile.am M src/osmo-bts-litecell15/Makefile.am M src/osmo-bts-litecell15/hw_misc.c A src/osmo-bts-litecell15/misc/lc15bts_bts.c A src/osmo-bts-litecell15/misc/lc15bts_bts.h M src/osmo-bts-litecell15/misc/lc15bts_clock.c A src/osmo-bts-litecell15/misc/lc15bts_led.c A src/osmo-bts-litecell15/misc/lc15bts_led.h M src/osmo-bts-litecell15/misc/lc15bts_mgr.c M src/osmo-bts-litecell15/misc/lc15bts_mgr.h M src/osmo-bts-litecell15/misc/lc15bts_mgr_temp.c M src/osmo-bts-litecell15/misc/lc15bts_mgr_vty.c M src/osmo-bts-litecell15/misc/lc15bts_misc.c M src/osmo-bts-litecell15/misc/lc15bts_misc.h M src/osmo-bts-litecell15/misc/lc15bts_par.c M src/osmo-bts-litecell15/misc/lc15bts_par.h M src/osmo-bts-litecell15/misc/lc15bts_power.c M src/osmo-bts-litecell15/misc/lc15bts_power.h M src/osmo-bts-litecell15/misc/lc15bts_temp.c M src/osmo-bts-litecell15/misc/lc15bts_temp.h 22 files changed, 2,014 insertions(+), 411 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/3277/2 diff --git a/doc/examples/litecell15/lc15bts-mgr.cfg b/doc/examples/litecell15/lc15bts-mgr.cfg index 750dc36..c7d0a79 100644 --- a/doc/examples/litecell15/lc15bts-mgr.cfg +++ b/doc/examples/litecell15/lc15bts-mgr.cfg @@ -25,39 +25,19 @@ no login ! lc15bts-mgr - limits supply - threshold warning 60 - threshold critical 78 - limits soc - threshold warning 60 - threshold critical 78 - limits fpga - threshold warning 60 - threshold critical 78 - limits logrf - threshold warning 60 - threshold critical 78 - limits tx0 - threshold warning 60 - threshold critical 78 - limits tx1 - threshold warning 60 - threshold critical 78 - limits pa0 - threshold warning 60 - threshold critical 78 - limits pa1 - threshold warning 60 - threshold critical 78 - actions normal - pa0-on - pa1-on - bts-service-on - actions warn - no pa0-off - no pa1-off - no bts-service-off - actions critical - pa0-off - pa1-off - no bts-service-off + limits supply_volt + threshold warning min 17500 + threshold critical min 19000 + limits tx0_vswr + threshold warning max 3 + limits tx1_vswr + threshold warning max 3 + limits supply_pwr + threshold warning max 110 + threshold critical max 120 + limits pa0_pwr + threshold warning max 50 + threshold critical max 60 + limits pa1_pwr + threshold warning max 50 + threshold critical max 60 diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index d8d3c6b..3d4bf91 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -124,6 +124,12 @@ int minTxPower; int maxTxPower; struct lc15l1_hdl *hdl; + uint8_t max_cell_size; /* 0:166 qbits*/ + uint8_t diversity_mode; /* 0: SISO A, 1: SISO B, 2: MRC */ + uint8_t pedestal_mode; /* 0: unused TS is OFF, 1: unused TS is in minimum Tx power */ + uint8_t dsp_alive_period; /* DSP alive timer period */ + 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; } u; }; diff --git a/src/common/Makefile.am b/src/common/Makefile.am index dd368d0..d104c48 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -2,6 +2,10 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOCODEC_CFLAGS) LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOCODEC_LIBS) +if ENABLE_LC15BTS +AM_CFLAGS += -DENABLE_LC15BTS +endif + noinst_LIBRARIES = libbts.a libl1sched.a libbts_a_SOURCES = gsm_data_shared.c sysinfo.c logging.c abis.c oml.c bts.c \ rsl.c vty.c paging.c measurement.c amr.c lchan.c \ diff --git a/src/osmo-bts-litecell15/Makefile.am b/src/osmo-bts-litecell15/Makefile.am index 3026e96..90e6c46 100644 --- a/src/osmo-bts-litecell15/Makefile.am +++ b/src/osmo-bts-litecell15/Makefile.am @@ -4,9 +4,11 @@ AM_CFLAGS = -Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOCODEC_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOTRAU_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBOSMOCTRL_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(LIBGPS_CFLAGS) $(ORTP_CFLAGS) COMMON_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOCODEC_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMOVTY_LIBS) $(LIBOSMOTRAU_LIBS) $(LIBOSMOABIS_LIBS) $(LIBOSMOCTRL_LIBS) $(ORTP_LIBS) -EXTRA_DIST = misc/lc15bts_mgr.h misc/lc15bts_misc.h misc/lc15bts_par.h \ +AM_CFLAGS += -DENABLE_LC15BTS + +EXTRA_DIS
[PATCH] openbsc[master]: bsc_vty: Add VTY command to test CTRL TRAP feature
Review at https://gerrit.osmocom.org/3278 bsc_vty: Add VTY command to test CTRL TRAP feature Using this new command (introduced in OsmoBSC + OsmoNITB), you can simulate the generation of TRAP events for testin purposes. start the control interface monitor as an example client program: ./openbsc/contrib/bsc_control.py -m -d localhost -p 4249 then start OsmoBSC or OsmoNITB, telnet to the VTY and enter 'enable' mode and issue the following (example) command: ctrl-interface generate-trap my.foo.var 2342 As a result, on the bsc_control.py you will see: Got message: TRAP 0 my.foo.var 2342 Change-Id: Ib1d2ec38290dc94797c1b365d9b733e5215ab7d1 --- M openbsc/src/libbsc/bsc_vty.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/78/3278/1 diff --git a/openbsc/src/libbsc/bsc_vty.c b/openbsc/src/libbsc/bsc_vty.c index 91a90c1..6472e9d 100644 --- a/openbsc/src/libbsc/bsc_vty.c +++ b/openbsc/src/libbsc/bsc_vty.c @@ -30,6 +30,7 @@ #include #include #include +#include #include @@ -4122,6 +4123,20 @@ rsl_ipacc_mdcx(lchan, ntohl(ia.s_addr), port, 0); return CMD_SUCCESS; } + +DEFUN(ctrl_trap, ctrl_trap_cmd, + "ctrl-interface generate-trap TRAP VALUE", + "Commands related to the CTRL Interface\n" + "Generate a TRAP for test purpose\n" + "Identity/Name of the TRAP variable\n" + "Value of the TRAP variable\n") +{ + struct gsm_network *net = gsmnet_from_vty(vty); + + ctrl_cmd_send_trap(net->ctrl, argv[0], (char *) argv[1]); + return CMD_SUCCESS; +} + extern int bsc_vty_init_extra(void); int bsc_vty_init(struct gsm_network *network) @@ -4325,6 +4340,7 @@ install_element(ENABLE_NODE, &lchan_act_cmd); install_element(ENABLE_NODE, &lchan_mdcx_cmd); install_element(ENABLE_NODE, &smscb_cmd_cmd); + install_element(ENABLE_NODE, &ctrl_trap_cmd); abis_nm_vty_init(); abis_om2k_vty_init(); -- To view, visit https://gerrit.osmocom.org/3278 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib1d2ec38290dc94797c1b365d9b733e5215ab7d1 Gerrit-PatchSet: 1 Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Owner: Harald Welte
osmo-bts[master]: lc15: fix BTS revision and hw options
Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
osmo-bts[master]: lc15: add trx-calibration to example config
Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/3252 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Gerrit-PatchSet: 1 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[PATCH] osmo-bts[master]: lc15: make default config usable
Hello Pau Espin Pedrol, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3252 to look at the new patch set (#2). lc15: make default config usable * add trx-calibration path * change GSM band to 900 Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Related: SYS#3722 --- M doc/examples/litecell15/osmo-bts.cfg 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/52/3252/2 diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts.cfg index 4eb9f29..de81587 100644 --- a/doc/examples/litecell15/osmo-bts.cfg +++ b/doc/examples/litecell15/osmo-bts.cfg @@ -30,10 +30,12 @@ ! phy 0 instance 0 + trx-calibration-path /mnt/rom/factory/calib phy 1 instance 0 + trx-calibration-path /mnt/rom/factory/calib bts 0 - band 1800 + band 900 ipa unit-id 1500 0 oml remote-ip 192.168.234.185 trx 0 -- To view, visit https://gerrit.osmocom.org/3252 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: newpatchset Gerrit-Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
[PATCH] osmo-iuh[master]: move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client* N...
Hello Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/3187 to look at the new patch set (#2). move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client* NOT FOR MERGE *** NOT FOR MERGE: use SCCP address book: the libsccp address book code is currently in flux, will follow in the next patch set when pmaier is ready with it *** To help split openbsc.git to separate MSC and SGSN repositories, place the common Iu interface related code here in libosmo-ranap. Also apply various improvements while moving (from intermittent code review). The code depends on libosmo-ranap tightly. One reason to want this separate from libosmo-ranap could be that it uses libosmo-sigtran, accepting an sccp instance. However, including in libosmo-ranap is the simplest way to go. The osmo-iuh build depends on libosmo-sigtran anyway because of OsmoHNBGW, and all current users of libosmo-ranap also naturally link libosmo-sigtran already. Apply prefix ranap_iu_ and RANAP_IU_ to allow smooth transition from the openbsc.git iu_ to the libranap ranap_iu_ implementations. Prune unneeded #include statements. Instead of sccp_addr, store an rnc pointer in the ue_conn_ctx. To facilitate, also: - Move iu_rnc struct to iu_client.h (as ranap_iu_rnc). - Instead of sccp_addr, pass rnc to ue_conn_ctx_alloc(). - Pass a local struct new_ue_conn_ctx containing the sccp_addr and conn_id up the RANAP handling stack in case of an InitialUE message. - Separate the InitialUE message handling from cn_ranap_handle_co(), by moving to new and separate cn_ranap_handle_co_initial(), so we can still pass a looked-up ue_conn_ctx to all other cn_ranap_handle_co() code paths. - Allocate the ue_conn_ctx only in ranap_handle_co_initial_ue(), not as early as before. Note that we are not actually ever using the rnc pointer now present in ue_conn_ctx. It could be used for more concise paging, to first page only the RNC where we last saw the subscriber. So far we page all matching LAC/RACs. Tweak error logging: use __func__ instead of writing the function names as string constants. In iu_client_vty.c: - Move the asn.1 debug commands from logging over to the iu node. They are not specific to the logging target. They could qualify for an entirely separate 'asn1' root node, but for simplicity place under 'iu'. - Add the 'asn1' commands to ranap_iu_vty_config_write(), so far missing. - remove the legacy "net." from a VTY error message, it is not known which name the parent node of 'iu' has. Change-Id: I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0 --- M include/osmocom/ranap/Makefile.am A include/osmocom/ranap/iu_client.h M src/Makefile.am A src/iu_client.c A src/iu_client_vty.c 5 files changed, 999 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/87/3187/2 diff --git a/include/osmocom/ranap/Makefile.am b/include/osmocom/ranap/Makefile.am index 0f83e03..1606928 100644 --- a/include/osmocom/ranap/Makefile.am +++ b/include/osmocom/ranap/Makefile.am @@ -12,6 +12,7 @@ ranap_common_cn.h \ ranap_msg_factory.h \ iu_helpers.h \ + iu_client.h \ RANAP_AccuracyFulfilmentIndicator.h \ RANAP_AllocationOrRetentionPriority.h \ RANAP_AlternativeRABConfigurationRequest.h \ diff --git a/include/osmocom/ranap/iu_client.h b/include/osmocom/ranap/iu_client.h new file mode 100644 index 000..873b2d2 --- /dev/null +++ b/include/osmocom/ranap/iu_client.h @@ -0,0 +1,74 @@ +#pragma once + +#include + +#include +#include +#include + +struct msgb; +struct osmo_auth_vector; + +struct RANAP_RAB_SetupOrModifiedItemIEs_s; +struct RANAP_Cause; + +struct ranap_iu_rnc; + +/* Debugging switches from asn1c and osmo-iuh */ +extern int asn_debug; +extern int asn1_xer_print; + +enum ranap_nsap_addr_enc { + RANAP_NSAP_ADDR_ENC_X213, + RANAP_NSAP_ADDR_ENC_V4RAW, +}; + +struct ranap_ue_conn_ctx { + struct llist_head list; + struct ranap_iu_rnc *rnc; + uint32_t conn_id; + int integrity_active; + struct gprs_ra_id ra_id; + enum ranap_nsap_addr_enc rab_assign_addr_enc; +}; + +enum ranap_iu_event_type { + RANAP_IU_EVENT_RAB_ASSIGN, + RANAP_IU_EVENT_SECURITY_MODE_COMPLETE, + RANAP_IU_EVENT_IU_RELEASE, /* An actual Iu Release message was received */ + RANAP_IU_EVENT_LINK_INVALIDATED, /* A SUA link was lost or closed down */ +}; + +extern const struct value_string ranap_iu_event_type_names[]; +static inline const char *ranap_iu_event_type_str(enum ranap_iu_event_type e) +{ + return get_value_string(ranap_iu_event_type_names, e); +} + +/* Implementations of iu_recv_cb_t shall find the ranap_ue_conn_ctx in msg->dst. */ +typedef int (* ranap_iu_recv_cb_t )(struct msgb *msg, struct gprs_ra_id *ra_id, + uint16_t *sai); + +typedef int (* ranap_iu_event_cb_t )(struct ranap_ue_conn_ctx *ue_ctx, +
osmo-bts[master]: lc15: fix BTS revision and hw options
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] osmo-bts[master]: lc15: fix BTS revision and hw options
Harald Welte has submitted this change and it was merged. Change subject: lc15: fix BTS revision and hw options .. lc15: fix BTS revision and hw options * remove typo in logging * add missing return statement * fix compilation warnings * add detailed logging for supported GSM band and related errors Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Related: SYS#3728 --- M src/osmo-bts-litecell15/l1_if.c M src/osmo-bts-litecell15/misc/lc15bts_bid.c 2 files changed, 15 insertions(+), 7 deletions(-) Approvals: Pau Espin Pedrol: Looks good to me, but someone else must approve Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c index b82a7c6..cb3efab 100644 --- a/src/osmo-bts-litecell15/l1_if.c +++ b/src/osmo-bts-litecell15/l1_if.c @@ -1369,7 +1369,7 @@ fl1h->hw_info.fpga_version[1] = sic->fpgaVersion.minor; fl1h->hw_info.fpga_version[2] = sic->fpgaVersion.build; - LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\nn", + LOGP(DL1C, LOGL_INFO, "DSP v%u.%u.%u, FPGA v%u.%u.%u\n", sic->dspVersion.major, sic->dspVersion.minor, sic->dspVersion.build, sic->fpgaVersion.major, sic->fpgaVersion.minor, sic->fpgaVersion.build); @@ -1468,18 +1468,24 @@ int rc; rc = lc15bts_rev_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS revision: %d\n", rc); return rc; + } fl1h->hw_info.ver_major = rc; rc = lc15bts_model_get(); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS model: %d\n", rc); return rc; + } fl1h->hw_info.ver_minor = rc; rc = lc15bts_option_get(LC15BTS_OPTION_BAND); - if (rc < 0) + if (rc < 0) { + LOGP(DL1C, LOGL_ERROR, "Failed to obtain LC15BTS_OPTION_BAND: %d\n", rc); return rc; + } switch (rc) { case LC15BTS_BAND_850: @@ -1495,8 +1501,12 @@ fl1h->hw_info.band_support = GSM_BAND_1900; break; default: + LOGP(DL1C, LOGL_ERROR, "Unexpected LC15BTS_BAND value: %d\n", rc); return -1; } + + LOGP(DL1C, LOGL_INFO, "BTS hw support band %s\n", gsm_band_name(fl1h->hw_info.band_support)); + return 0; } diff --git a/src/osmo-bts-litecell15/misc/lc15bts_bid.c b/src/osmo-bts-litecell15/misc/lc15bts_bid.c index ba2037a..7f278bf 100644 --- a/src/osmo-bts-litecell15/misc/lc15bts_bid.c +++ b/src/osmo-bts-litecell15/misc/lc15bts_bid.c @@ -87,11 +87,11 @@ return false; } fclose(fp); + return true; } int lc15bts_rev_get(void) { - FILE *fp; char rev; if (board_rev != -1) { @@ -107,9 +107,7 @@ int lc15bts_model_get(void) { -FILE *fp; int opt; - bool rc; if (board_option != -1) return board_option; -- To view, visit https://gerrit.osmocom.org/3275 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I73bccd81ec56845ba11b939937b295eb0f51b4a8 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
osmo-bts[master]: lc15: make default config usable
Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/3252 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol Gerrit-HasComments: No
[MERGED] osmo-bts[master]: lc15: make default config usable
Harald Welte has submitted this change and it was merged. Change subject: lc15: make default config usable .. lc15: make default config usable * add trx-calibration path * change GSM band to 900 Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Related: SYS#3722 --- M doc/examples/litecell15/osmo-bts.cfg 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/doc/examples/litecell15/osmo-bts.cfg b/doc/examples/litecell15/osmo-bts.cfg index e38428a..3036283 100644 --- a/doc/examples/litecell15/osmo-bts.cfg +++ b/doc/examples/litecell15/osmo-bts.cfg @@ -29,10 +29,12 @@ ! phy 0 instance 0 + trx-calibration-path /mnt/rom/factory/calib phy 1 instance 0 + trx-calibration-path /mnt/rom/factory/calib bts 0 - band 1800 + band 900 ipa unit-id 1500 0 oml remote-ip 192.168.234.185 trx 0 -- To view, visit https://gerrit.osmocom.org/3252 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I50bc4a4314a8b48e4000de445f4f05795e1a2d8b Gerrit-PatchSet: 3 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Max Gerrit-Reviewer: Pau Espin Pedrol
osmo-bts[master]: lc15: port lc15bts-mgr changes
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/3277/2//COMMIT_MSG Commit Message: Line 6: port from where? Which changes from which branch of which repository, up to which point (git commit ID) are included in this patch? THis information is what we will need later on to forward-port other related changes. It's sad enough that the respective vendor doesn't actively submit related changes upstream. What's the summary of those changes? -- To view, visit https://gerrit.osmocom.org/3277 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Iabbaedc84594150a4e5445c16dd1f6f89858 Gerrit-PatchSet: 2 Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Owner: Max Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Minh-Quang Nguyen Gerrit-Reviewer: jfdionne Gerrit-HasComments: Yes
osmo-iuh[master]: move openbsc.git's iu.h, iu.c, iu_vty.c here as iu_client* N...
Patch Set 2: (1 comment) https://gerrit.osmocom.org/#/c/3187/2/include/osmocom/ranap/iu_client.h File include/osmocom/ranap/iu_client.h: Line 31:struct gprs_ra_id ra_id; I decided to keep the gprs_ra_id. It is named such because it contains a rac on top of the usual circuit-switched mcc, mnc, lac. It comes from libosmocore's gsm48.h, so the scope is general enough, and been there since 2010. osmo_routing_area_id is identically suitable but it's not really worth having the patches only for dropping the 'gprs_' name. -- To view, visit https://gerrit.osmocom.org/3187 To unsubscribe, visit https://gerrit.osmocom.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6a3f7ad15be03fb94689b4af6ccfa828c25f45c0 Gerrit-PatchSet: 2 Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Owner: Neels Hofmeyr Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-HasComments: Yes