This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
fixeria gerrit-no-reply at lists.osmocom.orgfixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/23627 ) Change subject: Replace all references to 'sysmobts' with 'osmo-bts' ...................................................................... Replace all references to 'sysmobts' with 'osmo-bts' sysmoBTS is a BTS model sold by Sysmocom, which runs osmo-bts. The later may also work with some other back-ends, including the genaral purpose SDR hardware. Therefore, it's more logical to call it 'osmo-bts'. Change-Id: I93ab4dbf483e0786c35685b75ee4ea83bd591f7b --- M include/osmocom/bsc/bss.h M include/osmocom/bsc/bts.h M src/osmo-bsc/Makefile.am M src/osmo-bsc/bsc_ctrl_commands.c M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/bts_init.c A src/osmo-bsc/bts_osmobts.c D src/osmo-bsc/bts_sysmobts.c M src/osmo-bsc/lchan_fsm.c 9 files changed, 77 insertions(+), 77 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve dexter: Looks good to me, but someone else must approve keith: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/bss.h b/include/osmocom/bsc/bss.h index b8945db..199f981 100644 --- a/include/osmocom/bsc/bss.h +++ b/include/osmocom/bsc/bss.h @@ -16,5 +16,5 @@ extern int bts_model_rbs2k_init(void); extern int bts_model_nanobts_init(void); extern int bts_model_nokia_site_init(void); -extern int bts_model_sysmobts_init(void); +extern int bts_model_osmobts_init(void); #endif diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index d883570..bcc215d 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -554,7 +554,7 @@ return 0; } -static inline int is_sysmobts_v2(const struct gsm_bts *bts) +static inline int is_osmobts(const struct gsm_bts *bts) { switch (bts->type) { case GSM_BTS_TYPE_OSMOBTS: diff --git a/src/osmo-bsc/Makefile.am b/src/osmo-bsc/Makefile.am index 49b7890..ca39825 100644 --- a/src/osmo-bsc/Makefile.am +++ b/src/osmo-bsc/Makefile.am @@ -53,7 +53,7 @@ bts_nokia_site.c \ bts_siemens_bs11.c \ bts_sm.c \ - bts_sysmobts.c \ + bts_osmobts.c \ bts_unknown.c \ chan_alloc.c \ codec_pref.c \ diff --git a/src/osmo-bsc/bsc_ctrl_commands.c b/src/osmo-bsc/bsc_ctrl_commands.c index 9383167..96aeba2 100644 --- a/src/osmo-bsc/bsc_ctrl_commands.c +++ b/src/osmo-bsc/bsc_ctrl_commands.c @@ -102,7 +102,7 @@ * so let's us just reboot it. For the sysmoBTS we can just * restart the process as all state is gone. */ - if (!is_sysmobts_v2(bts) && strcmp(cmd->value, "restart") == 0) { + if (!is_osmobts(bts) && strcmp(cmd->value, "restart") == 0) { struct gsm_bts_trx *trx; llist_for_each_entry_reverse(trx, &bts->trx_list, list) abis_nm_ipaccess_restart(trx); diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 1a59fcb..0955ffe 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3795,7 +3795,7 @@ { struct gsm_bts *bts = vty->index; - if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) { + if (!is_ipaccess_bts(bts) || is_osmobts(bts)) { vty_out(vty, "%% This command is only intended for ipaccess nanoBTS. See OS#3707.%s", VTY_NEWLINE); return CMD_WARNING; @@ -5801,7 +5801,7 @@ return CMD_WARNING; } - if (!is_ipaccess_bts(bts) || is_sysmobts_v2(bts)) { + if (!is_ipaccess_bts(bts) || is_osmobts(bts)) { vty_out(vty, "%% This command only works for ipaccess nanoBTS.%s", VTY_NEWLINE); return CMD_WARNING; diff --git a/src/osmo-bsc/bts_init.c b/src/osmo-bsc/bts_init.c index 18f1ed4..0e3debc 100644 --- a/src/osmo-bsc/bts_init.c +++ b/src/osmo-bsc/bts_init.c @@ -24,7 +24,7 @@ bts_model_rbs2k_init(); bts_model_nanobts_init(); bts_model_nokia_site_init(); - bts_model_sysmobts_init(); + bts_model_osmobts_init(); /* Your new BTS here. */ return 0; } diff --git a/src/osmo-bsc/bts_osmobts.c b/src/osmo-bsc/bts_osmobts.c new file mode 100644 index 0000000..1814ada --- /dev/null +++ b/src/osmo-bsc/bts_osmobts.c @@ -0,0 +1,69 @@ +/* Osmocom OsmoBTS specific code */ + +/* (C) 2010-2012 by Harald Welte <laforge at gnumonks.org> + * + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +#include <arpa/inet.h> + +#include <osmocom/gsm/tlv.h> + +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/signal.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/bts.h> +#include <osmocom/abis/e1_input.h> +#include <osmocom/gsm/tlv.h> +#include <osmocom/core/msgb.h> +#include <osmocom/core/talloc.h> +#include <osmocom/bsc/gsm_data.h> +#include <osmocom/bsc/abis_nm.h> +#include <osmocom/bsc/abis_rsl.h> +#include <osmocom/bsc/debug.h> +#include <osmocom/abis/subchan_demux.h> +#include <osmocom/abis/ipaccess.h> +#include <osmocom/core/logging.h> + +extern struct gsm_bts_model bts_model_nanobts; + +static struct gsm_bts_model model_osmobts; + +int bts_model_osmobts_init(void) +{ + model_osmobts = bts_model_nanobts; + model_osmobts.name = "osmo-bts"; + model_osmobts.type = GSM_BTS_TYPE_OSMOBTS; + + /* Unlike nanoBTS, osmo-bts does support SI2bis and SI2ter fine */ + model_osmobts.force_combined_si = false; + + model_osmobts.features.data = &model_osmobts._features_data[0]; + model_osmobts.features.data_len = + sizeof(model_osmobts._features_data); + memset(model_osmobts.features.data, 0, model_osmobts.features.data_len); + + osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_GPRS); + osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_EGPRS); + osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_PAGING_COORDINATION); + osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_IPV6_NSVC); + osmo_bts_set_feature(&model_osmobts.features, BTS_FEAT_CCN); + + model_osmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V; + + return gsm_bts_model_register(&model_osmobts); +} diff --git a/src/osmo-bsc/bts_sysmobts.c b/src/osmo-bsc/bts_sysmobts.c deleted file mode 100644 index f24c615..0000000 --- a/src/osmo-bsc/bts_sysmobts.c +++ /dev/null @@ -1,69 +0,0 @@ -/* sysmocom sysmoBTS specific code */ - -/* (C) 2010-2012 by Harald Welte <laforge at gnumonks.org> - * - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include <arpa/inet.h> - -#include <osmocom/gsm/tlv.h> - -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/bsc/signal.h> -#include <osmocom/bsc/abis_nm.h> -#include <osmocom/bsc/bts.h> -#include <osmocom/abis/e1_input.h> -#include <osmocom/gsm/tlv.h> -#include <osmocom/core/msgb.h> -#include <osmocom/core/talloc.h> -#include <osmocom/bsc/gsm_data.h> -#include <osmocom/bsc/abis_nm.h> -#include <osmocom/bsc/abis_rsl.h> -#include <osmocom/bsc/debug.h> -#include <osmocom/abis/subchan_demux.h> -#include <osmocom/abis/ipaccess.h> -#include <osmocom/core/logging.h> - -extern struct gsm_bts_model bts_model_nanobts; - -static struct gsm_bts_model model_sysmobts; - -int bts_model_sysmobts_init(void) -{ - model_sysmobts = bts_model_nanobts; - model_sysmobts.name = "sysmobts"; - model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS; - - /* Unlike nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */ - model_sysmobts.force_combined_si = false; - - model_sysmobts.features.data = &model_sysmobts._features_data[0]; - model_sysmobts.features.data_len = - sizeof(model_sysmobts._features_data); - memset(model_sysmobts.features.data, 0, model_sysmobts.features.data_len); - - osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_GPRS); - osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_EGPRS); - osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_PAGING_COORDINATION); - osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_IPV6_NSVC); - osmo_bts_set_feature(&model_sysmobts.features, BTS_FEAT_CCN); - - model_sysmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V; - - return gsm_bts_model_register(&model_sysmobts); -} diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index ffcf2b1..0e2eb82 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -1304,7 +1304,7 @@ lchan->release.rr_cause = bsc_gsm48_rr_cause_from_rsl_cause(lchan->release.rsl_error_cause); lchan_fsm_state_chg(LCHAN_ST_WAIT_AFTER_ERROR); /* TODO: we used to do this only for sysmobts: - int do_free = is_sysmobts_v2(ts->trx->bts); + int do_free = is_osmobts(ts->trx->bts); LOGP(DRSL, LOGL_NOTICE, "%s CHAN REL ACK for broken channel. %s.\n", gsm_lchan_name(lchan), -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/23627 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I93ab4dbf483e0786c35685b75ee4ea83bd591f7b Gerrit-Change-Number: 23627 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier at sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de> Gerrit-Reviewer: keith <keith at rhizomatica.org> Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-Reviewer: pespin <pespin at sysmocom.de> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210412/35cce68b/attachment.htm>