Osmocom Open Build Service

osmo-bsc.spec Changed

commit_8798689f3bc737c1f1d2da58803673a05291ee72.txt Added

commit_ff3540cb2c9aa1a06d10b7bf9f85be4620dbde66.txt Deleted

osmo-bsc_1.10.0.169.ff354.dsc -> osmo-bsc_1.10.0.170.87986.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-bsc
 Binary: osmo-bsc, osmo-bsc-dbg, abisip-find, osmo-bsc-ipaccess-utils, osmo-bsc-bs11-utils, osmo-bsc-meas-utils, osmo-bsc-doc
 Architecture: any all
-Version: 1.10.0.169.ff354
+Version: 1.10.0.170.87986
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmo-bsc
 Standards-Version: 3.9.8
@@ -18,8 +18,8 @@
  osmo-bsc-ipaccess-utils deb net extra arch=any
  osmo-bsc-meas-utils deb net extra arch=any
 Checksums-Sha1:
- 3de565aebcee1a46b0fbf0df95105793f820989d 601704 osmo-bsc_1.10.0.169.ff354.tar.xz
+ 72cbfed2e377382c014f1415722c7a7cd71937b9 602172 osmo-bsc_1.10.0.170.87986.tar.xz
 Checksums-Sha256:
- 011c543cdc05765bc78c857228b108358a04a1728e1396110595ceaaa0d3c6c0 601704 osmo-bsc_1.10.0.169.ff354.tar.xz
+ 03ad330b57f14956a5c9fa512dddeaede07546dc24b63f5539622420eeef72e8 602172 osmo-bsc_1.10.0.170.87986.tar.xz
 Files:
- 3d5611588462275e75596c4d29a76a53 601704 osmo-bsc_1.10.0.169.ff354.tar.xz
+ 4d9ba8872b08a7ae5a9025c14fab0201 602172 osmo-bsc_1.10.0.170.87986.tar.xz

osmo-bsc_1.10.0.169.ff354.tar.xz/.tarball-version -> osmo-bsc_1.10.0.170.87986.tar.xz/.tarball-version Changed

osmo-bsc_1.10.0.169.ff354.tar.xz/debian/changelog -> osmo-bsc_1.10.0.170.87986.tar.xz/debian/changelog Changed

osmo-bsc_1.10.0.169.ff354.tar.xz/include/osmocom/bsc/bts.h -> osmo-bsc_1.10.0.170.87986.tar.xz/include/osmocom/bsc/bts.h Changed

osmo-bsc_1.10.0.169.ff354.tar.xz/src/osmo-bsc/bts_vty.c -> osmo-bsc_1.10.0.170.87986.tar.xz/src/osmo-bsc/bts_vty.c Changed

@@ -1107,6 +1107,46 @@
 	return CMD_SUCCESS;
 }
 
+DEFUN_USRATTR(cfg_bts_nch_position,
+	      cfg_bts_nch_position_cmd,
+	      X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
+	      "nch-position num-blocks <1-7> first-block <0-6>",
+	      "NCH (Notification Channel) position within CCCH\n"
+	      "Number of blocks reserved for NCH\n"
+	      "Number of blocks reserved for NCH\n"
+	      "First block reserved for NCH\n"
+	      "First block reserved for NCH\n")
+{
+	struct gsm_bts *bts = vty->index;
+	int num_blocks = atoi(argv0);
+	int first_block = atoi(argv1);
+
+	if (osmo_gsm48_si1ro_nch_pos_encode(num_blocks, first_block)) {
+		vty_out(vty, "num-blocks %u first-block %u is not permitted by 3GPP TS 44.010 Table 10.5.2.32.1b%s",
+			num_blocks, first_block, VTY_NEWLINE);
+		return CMD_WARNING;
+	}
+
+	bts->nch.num_blocks = num_blocks;
+	bts->nch.first_block = first_block;
+
+	return CMD_SUCCESS;
+}
+
+DEFUN_USRATTR(cfg_bts_no_nch_position,
+	      cfg_bts_no_nch_position_cmd,
+	      X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
+	      "no nch-position",
+	      NO_STR "Disable NCH in this BTS\n")
+{
+	struct gsm_bts *bts = vty->index;
+
+	bts->nch.num_blocks = 0;
+	bts->nch.first_block = 0;
+
+	return CMD_SUCCESS;
+}
+
 DEFUN_USRATTR(cfg_bts_cell_barred,
 	      cfg_bts_cell_barred_cmd,
 	      X(BSC_VTY_ATTR_RESTART_ABIS_RSL_LINK),
@@ -4405,6 +4445,12 @@
 		bts->si_common.chan_desc.bs_pa_mfrms + 2, VTY_NEWLINE);
 	vty_out(vty, "  channel-description bs-ag-blks-res %u%s",
 		bts->si_common.chan_desc.bs_ag_blks_res, VTY_NEWLINE);
+	if (bts->nch.num_blocks) {
+		vty_out(vty, "  nch-position num-blocks %u first-block %u%s",
+			bts->nch.num_blocks, bts->nch.first_block, VTY_NEWLINE);
+	} else {
+		vty_out(vty, "  no nch-position%s", VTY_NEWLINE);
+	}
 
 	if (bts->ccch_load_ind_thresh != 10)
 		vty_out(vty, "  ccch load-indication-threshold %u%s",
@@ -4851,6 +4897,8 @@
 	install_element(BTS_NODE, &cfg_bts_interf_meas_level_bounds_cmd);
 	install_element(BTS_NODE, &cfg_bts_srvcc_fast_return_cmd);
 	install_element(BTS_NODE, &cfg_bts_immediate_assignment_cmd);
+	install_element(BTS_NODE, &cfg_bts_nch_position_cmd);
+	install_element(BTS_NODE, &cfg_bts_no_nch_position_cmd);
 
 	neighbor_ident_vty_init();
 	/* See also handover commands added on bts level from handover_vty.c */

osmo-bsc_1.10.0.169.ff354.tar.xz/src/osmo-bsc/osmo_bsc_main.c -> osmo-bsc_1.10.0.170.87986.tar.xz/src/osmo-bsc/osmo_bsc_main.c Changed

@@ -393,6 +393,12 @@
 			     bts->si_common.chan_desc.bs_ag_blks_res);
 			bts->si_common.chan_desc.bs_ag_blks_res = 2;
 		}
+
+		if (!(bts->nch.num_blocks == 1 && (bts->nch.first_block == 0 || bts->nch.first_block == 1)) &&
+		    !(bts->nch.num_blocks == 2 && bts->nch.first_block == 0)) {
+			LOG_BTS(bts, DNM, LOGL_ERROR, "CCCH is combined with SDCCHs, but NCH position/size is "
+				"incompatible with that. Please fix your config!\n");
+		}
 	} else { /* Non-combined TS0/C0 configuration */
 		/* There can be additional CCCHs on even timeslot numbers */
 		n += (bts->c0->ts2.pchan_from_config == GSM_PCHAN_CCCH);
@@ -401,6 +407,13 @@
 		bts->si_common.chan_desc.ccch_conf = (n << 1);
 	}
 
+	if (bts->nch.first_block + bts->nch.num_blocks > bts->si_common.chan_desc.bs_ag_blks_res) {
+		LOG_BTS(bts, DNM, LOGL_ERROR, "Position/Number of NCH blocks (%u..%u) exceeds AGCH (%u)."
+			"Please fix your config!\n", bts->nch.first_block,
+			bts->nch.first_block + bts->nch.num_blocks - 1,
+			bts->si_common.chan_desc.bs_ag_blks_res);
+	}
+
 	bts_setup_ramp_init_bts(bts);
 
 	/* ACC ramping is initialized from vty/config */

osmo-bsc_1.10.0.169.ff354.tar.xz/src/osmo-bsc/system_information.c -> osmo-bsc_1.10.0.170.87986.tar.xz/src/osmo-bsc/system_information.c Changed

Changes of Revision 150