Move DTX settings to BTS

* Add per-BTS DTX settings
* Configure Uplink and Downlink DTX separately
* Deprecate global DTX option (it was never tested/used anyway)
* Use libosmocore function for DTX indicator in System
  Information (previously it was incorrectly assigned for half-rate
  channels)

Related: OS#22
Change-Id: I3d55168475ad47044b6238b55846ea22bdd518a4
Reviewed-on: https://gerrit.osmocom.org/40
Tested-by: Jenkins Builder
Reviewed-by: Holger Freyther <holger@freyther.de>
changes/45/3445/1
Maxim Suraev 7 years ago committed by Holger Freyther
parent 9a7e25b9c3
commit c08ee71bff
  1. 3
      openbsc/doc/examples/osmo-bsc/osmo-bsc.cfg
  2. 1
      openbsc/doc/examples/osmo-nitb/rbs2308/openbsc.cfg
  3. 3
      openbsc/include/openbsc/gsm_data.h
  4. 6
      openbsc/include/openbsc/gsm_data_shared.h
  5. 11
      openbsc/src/libbsc/abis_rsl.c
  6. 6
      openbsc/src/libbsc/bsc_init.c
  7. 85
      openbsc/src/libbsc/bsc_vty.c
  8. 5
      openbsc/src/libbsc/system_information.c
  9. 6
      openbsc/src/libcommon/gsm_data.c

@ -40,7 +40,6 @@ network
timer t3119 0
timer t3122 0
timer t3141 0
dtx-used 0
subscriber-keep-in-ram 0
bts 0
type nanobts
@ -55,6 +54,8 @@ network
channel allocator ascending
rach tx integer 9
rach max transmission 7
dtx uplink force
dtx downlink
ip.access unit_id 0 0
oml ip.access stream_id 255 line 0
neighbor-list mode manual-si5

@ -37,7 +37,6 @@ network
timer t3119 0
timer t3122 0
timer t3141 0
dtx-used 0
subscriber-keep-in-ram 0
bts 0
type rbs2000

@ -269,9 +269,6 @@ struct gsm_network {
enum rrlp_mode mode;
} rrlp;
/* enable the DTXu and DTXd for this network */
int dtx_enabled;
enum gsm_chan_t ctype_by_chreq[16];
/* Use a TCH for handling requests of type paging any */

@ -14,7 +14,7 @@
#include <osmocom/gsm/rxlev_stat.h>
#include <osmocom/gsm/sysinfo.h>
#include <osmocom/gsm/meas_rep.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <osmocom/gsm/protocol/gsm_12_21.h>
@ -594,6 +594,10 @@ struct gsm_bts {
/* number of this BTS on given E1 link */
uint8_t bts_nr;
/* DTX features of this BTS */
enum gsm48_dtx_mode dtxu;
bool dtxd;
/* paging state and control */
struct gsm_bts_paging_state paging;

@ -35,6 +35,8 @@
#include <openbsc/bsc_rll.h>
#include <openbsc/debug.h>
#include <osmocom/gsm/tlv.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/protocol/gsm_08_58.h>
#include <openbsc/paging.h>
#include <openbsc/signal.h>
#include <openbsc/meas_rep.h>
@ -345,10 +347,11 @@ static int channel_mode_from_lchan(struct rsl_ie_chan_mode *cm,
memset(cm, 0, sizeof(*cm));
/* FIXME: what to do with data calls ? */
if (lchan->ts->trx->bts->network->dtx_enabled)
cm->dtx_dtu = 0x03;
else
cm->dtx_dtu = 0x00;
cm->dtx_dtu = 0;
if (lchan->ts->trx->bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED)
cm->dtx_dtu |= RSL_CMOD_DTXu;
if (lchan->ts->trx->bts->dtxd)
cm->dtx_dtu |= RSL_CMOD_DTXd;
/* set TCH Speech/Data */
cm->spd_ind = lchan->rsl_cmode;

@ -458,12 +458,6 @@ static int bootstrap_bts(struct gsm_bts *bts)
return -EINVAL;
}
/* allow/disallow DTXu */
if (bts->network->dtx_enabled)
bts->si_common.cell_options.dtx = 0;
else
bts->si_common.cell_options.dtx = 2;
bts->si_common.cell_options.pwrc = 0; /* PWRC not set */
bts->si_common.cell_sel_par.acs = 0;

@ -18,6 +18,7 @@
*/
#include <stdlib.h>
#include <stdbool.h>
#include <unistd.h>
#include <osmocom/vty/command.h>
@ -27,7 +28,7 @@
#include <osmocom/vty/stats.h>
#include <osmocom/vty/telnet_interface.h>
#include <osmocom/vty/misc.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <osmocom/gsm/gsm0502.h>
#include <arpa/inet.h>
@ -273,6 +274,14 @@ static void bts_dump_vty(struct vty *vty, struct gsm_bts *bts)
VTY_NEWLINE);
if (bts->si_common.rach_control.cell_bar)
vty_out(vty, " CELL IS BARRED%s", VTY_NEWLINE);
if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED)
vty_out(vty, "Uplink DTX: %s%s",
(bts->dtxu != GSM48_DTX_SHALL_BE_USED) ?
"enabled" : "forced", VTY_NEWLINE);
else
vty_out(vty, "Uplink DTX: not enabled%s", VTY_NEWLINE);
vty_out(vty, "Downlink DTX: %senabled%s", bts->dtxd ? "" : "not ",
VTY_NEWLINE);
vty_out(vty, "Channel Description Attachment: %s%s",
(bts->si_common.chan_desc.att) ? "yes" : "no", VTY_NEWLINE);
vty_out(vty, "Channel Description BS-PA-MFRMS: %u%s",
@ -549,6 +558,12 @@ static void config_write_bts_single(struct vty *vty, struct gsm_bts *bts)
vty_out(vty, " cell_identity %u%s", bts->cell_identity, VTY_NEWLINE);
vty_out(vty, " location_area_code %u%s", bts->location_area_code,
VTY_NEWLINE);
if (bts->dtxu != GSM48_DTX_SHALL_NOT_BE_USED)
vty_out(vty, " dtx uplink%s%s",
(bts->dtxu != GSM48_DTX_SHALL_BE_USED) ? "" : " force",
VTY_NEWLINE);
if (bts->dtxd)
vty_out(vty, " dtx downlink%s", VTY_NEWLINE);
vty_out(vty, " base_station_id_code %u%s", bts->bsic, VTY_NEWLINE);
if (bts->tz.override != 0) {
if (bts->tz.dst)
@ -809,7 +824,6 @@ static int config_write_net(struct vty *vty)
vty_out(vty, " timer t3119 %u%s", gsmnet->T3119, VTY_NEWLINE);
vty_out(vty, " timer t3122 %u%s", gsmnet->T3122, VTY_NEWLINE);
vty_out(vty, " timer t3141 %u%s", gsmnet->T3141, VTY_NEWLINE);
vty_out(vty, " dtx-used %u%s", gsmnet->dtx_enabled, VTY_NEWLINE);
vty_out(vty, " subscriber-keep-in-ram %d%s",
gsmnet->subscr_group->keep_subscr, VTY_NEWLINE);
@ -1613,15 +1627,14 @@ DECLARE_TIMER(3119, "Currently not used.\n")
DECLARE_TIMER(3122, "Waiting time (seconds) after IMM ASS REJECT\n")
DECLARE_TIMER(3141, "Currently not used.\n")
DEFUN(cfg_net_dtx,
cfg_net_dtx_cmd,
"dtx-used (0|1)",
"Enable the usage of DTX.\n"
"DTX is disabled\n" "DTX is enabled\n")
DEFUN_DEPRECATED(cfg_net_dtx,
cfg_net_dtx_cmd,
"dtx-used (0|1)",
".HIDDEN\n""Obsolete\n""Obsolete\n")
{
struct gsm_network *gsmnet = gsmnet_from_vty(vty);
gsmnet->dtx_enabled = atoi(argv[0]);
return CMD_SUCCESS;
vty_out(vty, "%% 'dtx-used' is now deprecated: use dtx * "
"configuration options of BTS instead%s", VTY_NEWLINE);
return CMD_SUCCESS;
}
DEFUN(cfg_net_subscr_keep,
@ -1704,6 +1717,54 @@ DEFUN(cfg_bts_band,
return CMD_SUCCESS;
}
DEFUN(cfg_bts_dtxu, cfg_bts_dtxu_cmd, "dtx uplink [force]",
"Configure discontinuous transmission\n"
"Enable Uplink DTX for this BTS\n"
"MS 'shall' use DTXu instead of 'may' use (might not be supported by "
"older phones).\n")
{
struct gsm_bts *bts = vty->index;
bts->dtxu = (argc > 0) ? GSM48_DTX_SHALL_BE_USED : GSM48_DTX_MAY_BE_USED;
return CMD_SUCCESS;
}
DEFUN(cfg_bts_no_dtxu, cfg_bts_no_dtxu_cmd, "no dtx uplink",
NO_STR
"Configure discontinuous transmission\n"
"Disable Uplink DTX for this BTS\n")
{
struct gsm_bts *bts = vty->index;
bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED;
return CMD_SUCCESS;
}
DEFUN(cfg_bts_dtxd, cfg_bts_dtxd_cmd, "dtx downlink",
"Configure discontinuous transmission\n"
"Enable Downlink DTX for this BTS\n")
{
struct gsm_bts *bts = vty->index;
bts->dtxd = true;
return CMD_SUCCESS;
}
DEFUN(cfg_bts_no_dtxd, cfg_bts_no_dtxd_cmd, "no dtx downlink",
NO_STR
"Configure discontinuous transmission\n"
"Disable Downlink DTX for this BTS\n")
{
struct gsm_bts *bts = vty->index;
bts->dtxd = false;
return CMD_SUCCESS;
}
DEFUN(cfg_bts_ci,
cfg_bts_ci_cmd,
"cell_identity <0-65535>",
@ -3948,6 +4009,10 @@ int bsc_vty_init(const struct log_info *cat)
install_element(BTS_NODE, &cfg_no_description_cmd);
install_element(BTS_NODE, &cfg_bts_band_cmd);
install_element(BTS_NODE, &cfg_bts_ci_cmd);
install_element(BTS_NODE, &cfg_bts_dtxu_cmd);
install_element(BTS_NODE, &cfg_bts_dtxd_cmd);
install_element(BTS_NODE, &cfg_bts_no_dtxu_cmd);
install_element(BTS_NODE, &cfg_bts_no_dtxd_cmd);
install_element(BTS_NODE, &cfg_bts_lac_cmd);
install_element(BTS_NODE, &cfg_bts_tsc_cmd);
install_element(BTS_NODE, &cfg_bts_bsic_cmd);

@ -717,6 +717,9 @@ static int generate_si3(uint8_t *output, struct gsm_bts *bts)
si3->cell_sel_par = bts->si_common.cell_sel_par;
si3->rach_control = bts->si_common.rach_control;
/* allow/disallow DTXu */
gsm48_set_dtx(&si3->cell_options, bts->dtxu, bts->dtxu, true);
if ((bts->si_valid & (1 << SYSINFO_TYPE_2ter))) {
LOGP(DRR, LOGL_INFO, "SI 2ter is included.\n");
si_info.si2ter_indicator = 1;
@ -928,6 +931,8 @@ static int generate_si6(uint8_t *output, struct gsm_bts *bts)
bts->location_area_code);
si6->cell_options = bts->si_common.cell_options;
si6->ncc_permitted = bts->si_common.ncc_permitted;
/* allow/disallow DTXu */
gsm48_set_dtx(&si6->cell_options, bts->dtxu, bts->dtxu, true);
/* SI6 Rest Octets: 10.5.2.35a: PCH / NCH info, VBS/VGCS options */

@ -23,7 +23,7 @@
#include <string.h>
#include <errno.h>
#include <ctype.h>
#include <stdbool.h>
#include <netinet/in.h>
#include <osmocom/core/linuxlist.h>
@ -31,6 +31,7 @@
#include <osmocom/gsm/gsm_utils.h>
#include <osmocom/gsm/abis_nm.h>
#include <osmocom/core/statistics.h>
#include <osmocom/gsm/protocol/gsm_04_08.h>
#include <openbsc/gsm_data.h>
#include <openbsc/osmo_msc_data.h>
@ -311,7 +312,8 @@ struct gsm_bts *gsm_bts_alloc_register(struct gsm_network *net, enum gsm_bts_typ
bts->type = type;
bts->model = model;
bts->bsic = bsic;
bts->dtxu = GSM48_DTX_SHALL_NOT_BE_USED;
bts->dtxd = false;
bts->neigh_list_manual_mode = 0;
bts->si_common.cell_sel_par.cell_resel_hyst = 2; /* 4 dB */
bts->si_common.cell_sel_par.rxlev_acc_min = 0;

Loading…
Cancel
Save