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
This commit is contained in:
parent
3fd19268ae
commit
d51d96c99c
|
@ -16,5 +16,5 @@ extern int bts_model_bs11_init(void);
|
|||
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
|
||||
|
|
|
@ -554,7 +554,7 @@ static inline int is_ipaccess_bts(const struct gsm_bts *bts)
|
|||
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:
|
||||
|
|
|
@ -53,7 +53,7 @@ osmo_bsc_SOURCES = \
|
|||
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 \
|
||||
|
|
|
@ -102,7 +102,7 @@ static int set_net_apply_config(struct ctrl_cmd *cmd, void *data)
|
|||
* 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);
|
||||
|
|
|
@ -3795,7 +3795,7 @@ DEFUN_USRATTR(cfg_bts_no_si_unused_send_empty,
|
|||
{
|
||||
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 @@ DEFUN(restart_bts, restart_bts_cmd,
|
|||
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;
|
||||
|
|
|
@ -24,7 +24,7 @@ int bts_init(void)
|
|||
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;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* sysmocom sysmoBTS specific code */
|
||||
/* Osmocom OsmoBTS specific code */
|
||||
|
||||
/* (C) 2010-2012 by Harald Welte <laforge@gnumonks.org>
|
||||
*
|
||||
|
@ -41,29 +41,29 @@
|
|||
|
||||
extern struct gsm_bts_model bts_model_nanobts;
|
||||
|
||||
static struct gsm_bts_model model_sysmobts;
|
||||
static struct gsm_bts_model model_osmobts;
|
||||
|
||||
int bts_model_sysmobts_init(void)
|
||||
int bts_model_osmobts_init(void)
|
||||
{
|
||||
model_sysmobts = bts_model_nanobts;
|
||||
model_sysmobts.name = "sysmobts";
|
||||
model_sysmobts.type = GSM_BTS_TYPE_OSMOBTS;
|
||||
model_osmobts = bts_model_nanobts;
|
||||
model_osmobts.name = "osmo-bts";
|
||||
model_osmobts.type = GSM_BTS_TYPE_OSMOBTS;
|
||||
|
||||
/* Unlike nanoBTS, sysmoBTS supports SI2bis and SI2ter fine */
|
||||
model_sysmobts.force_combined_si = false;
|
||||
/* Unlike nanoBTS, osmo-bts does support SI2bis and SI2ter fine */
|
||||
model_osmobts.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);
|
||||
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_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);
|
||||
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_sysmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V;
|
||||
model_osmobts.nm_att_tlvdef.def[NM_ATT_OSMO_NS_LINK_CFG].type = TLV_TYPE_TL16V;
|
||||
|
||||
return gsm_bts_model_register(&model_sysmobts);
|
||||
return gsm_bts_model_register(&model_osmobts);
|
||||
}
|
|
@ -1304,7 +1304,7 @@ static void lchan_fsm_borken(struct osmo_fsm_inst *fi, uint32_t event, void *dat
|
|||
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),
|
||||
|
|
Loading…
Reference in New Issue