Osmocom Open Build Service

osmo-bsc.spec Changed

commit_94878456e2ce157e18f44e97937f0f257dee2f63.txt Added

commit_e55a114e8ac7b415f91bac394e457762de939775.txt Deleted

osmo-bsc_1.10.0.233.e55a1.dsc -> osmo-bsc_1.10.0.237.94878.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.233.e55a1
+Version: 1.10.0.237.94878
 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:
- 431feaa07b3ab8545fbe98c553d0f8462fa0311e 613812 osmo-bsc_1.10.0.233.e55a1.tar.xz
+ 38f3deffe8af1ba0c8fbb784772bc633aca6c812 613916 osmo-bsc_1.10.0.237.94878.tar.xz
 Checksums-Sha256:
- f65bfa6d9bd78973f3baa4b52e04213f87ef93d1d05b822c31b855127237bd79 613812 osmo-bsc_1.10.0.233.e55a1.tar.xz
+ 386552c47bfd39e7280a1c058af67028858499d0f2639f5b286efdd015255dec 613916 osmo-bsc_1.10.0.237.94878.tar.xz
 Files:
- cf7d5c020cda1550dcd6b4c65e7a250e 613812 osmo-bsc_1.10.0.233.e55a1.tar.xz
+ 5724938c8d7f31b87245844125dfeb7d 613916 osmo-bsc_1.10.0.237.94878.tar.xz

osmo-bsc_1.10.0.233.e55a1.tar.xz/.tarball-version -> osmo-bsc_1.10.0.237.94878.tar.xz/.tarball-version Changed

osmo-bsc_1.10.0.233.e55a1.tar.xz/debian/changelog -> osmo-bsc_1.10.0.237.94878.tar.xz/debian/changelog Changed

osmo-bsc_1.10.0.233.e55a1.tar.xz/src/osmo-bsc/bts.c -> osmo-bsc_1.10.0.237.94878.tar.xz/src/osmo-bsc/bts.c Changed

osmo-bsc_1.10.0.233.e55a1.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c -> osmo-bsc_1.10.0.237.94878.tar.xz/src/osmo-bsc/bts_ipaccess_nanobts_omlattr.c Changed

@@ -112,7 +112,9 @@
 struct msgb *nanobts_gen_set_nse_attr(struct gsm_bts_sm *bts_sm)
 {
 	struct msgb *msgb;
-	uint8_t buf256;
+	uint8_t buf2;
+	struct abis_nm_ipacc_att_ns_cfg ns_cfg;
+	struct abis_nm_ipacc_att_bssgp_cfg bssgp_cfg;
 	struct gsm_bts *bts = gsm_bts_sm_get_bts(bts_sm);
 	msgb = msgb_alloc(1024, "nanobts_attr_bts");
 	if (!msgb)
@@ -123,27 +125,33 @@
 	buf1 = bts_sm->gprs.nse.nsei & 0xff;
 	msgb_tl16v_put(msgb, NM_ATT_IPACC_NSEI, 2, buf);
 
-	/* all timers in seconds */
-	OSMO_ASSERT(ARRAY_SIZE(bts_sm->gprs.nse.timer) < sizeof(buf));
-	memcpy(buf, bts_sm->gprs.nse.timer, ARRAY_SIZE(bts_sm->gprs.nse.timer));
-	msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, 7, buf);
-
-	/* all timers in seconds */
-	buf0 = 3;	/* blockimg timer (T1) */
-	buf1 = 3;	/* blocking retries */
-	buf2 = 3;	/* unblocking retries */
-	buf3 = 3;	/* reset timer (T2) */
-	buf4 = 3;	/* reset retries */
-	buf5 = 10;	/* suspend timer (T3) in 100ms */
-	buf6 = 3;	/* suspend retries */
-	buf7 = 10;	/* resume timer (T4) in 100ms */
-	buf8 = 3;	/* resume retries */
-	buf9 = 10;	/* capability update timer (T5) */
-	buf10 = 3;	/* capability update retries */
-
-	OSMO_ASSERT(ARRAY_SIZE(bts->gprs.cell.timer) < sizeof(buf));
-	memcpy(buf, bts->gprs.cell.timer, ARRAY_SIZE(bts->gprs.cell.timer));
-	msgb_tl16v_put(msgb, NM_ATT_IPACC_BSSGP_CFG, 11, buf);
+	osmo_static_assert(ARRAY_SIZE(bts_sm->gprs.nse.timer) == 7, nse_timer_array_wrong_size);
+	ns_cfg = (struct abis_nm_ipacc_att_ns_cfg){
+		.un_blocking_timer =	bts_sm->gprs.nse.timer0,
+		.un_blocking_retries =	bts_sm->gprs.nse.timer1,
+		.reset_timer =		bts_sm->gprs.nse.timer2,
+		.reset_retries =	bts_sm->gprs.nse.timer3,
+		.test_timer =		bts_sm->gprs.nse.timer4,
+		.alive_timer =		bts_sm->gprs.nse.timer5,
+		.alive_retries =	bts_sm->gprs.nse.timer6,
+	};
+	msgb_tl16v_put(msgb, NM_ATT_IPACC_NS_CFG, sizeof(ns_cfg), (const uint8_t *)&ns_cfg);
+
+	osmo_static_assert(ARRAY_SIZE(bts->gprs.cell.timer) == 11, cell_timer_array_wrong_size);
+	bssgp_cfg = (struct abis_nm_ipacc_att_bssgp_cfg){
+		.t1_s =			bts->gprs.cell.timer0,
+		.t1_blocking_retries =	bts->gprs.cell.timer1,
+		.t1_unblocking_retries = bts->gprs.cell.timer2,
+		.t2_s =			bts->gprs.cell.timer3,
+		.t2_retries =		bts->gprs.cell.timer4,
+		.t3_100ms =		bts->gprs.cell.timer5,
+		.t3_retries =		bts->gprs.cell.timer6,
+		.t4_100ms =		bts->gprs.cell.timer7,
+		.t4_retries =		bts->gprs.cell.timer8,
+		.t5_s =			bts->gprs.cell.timer9,
+		.t5_retries =		bts->gprs.cell.timer10,
+	};
+	msgb_tl16v_put(msgb, NM_ATT_IPACC_BSSGP_CFG, sizeof(bssgp_cfg), (const uint8_t *)&bssgp_cfg);
 
 	return msgb;
 }
@@ -151,7 +159,9 @@
 struct msgb *nanobts_gen_set_cell_attr(struct gsm_bts *bts)
 {
 	struct msgb *msgb;
-	uint8_t buf256;
+	struct abis_nm_ipacc_att_rlc_cfg rlc_cfg;
+	struct abis_nm_ipacc_att_rlc_cfg_2 rlc_cfg_2;
+	uint8_t buf2;
 	msgb = msgb_alloc(1024, "nanobts_attr_bts");
 	if (!msgb)
 		return NULL;
@@ -170,16 +180,18 @@
 	msgb_tl16v_put(msgb, NM_ATT_IPACC_BVCI, 2, buf);
 
 	/* all timers in seconds, unless otherwise stated */
-	buf0 = 20;	/* T3142 */
-	buf1 = 5;	/* T3169 */
-	buf2 = 5;	/* T3191 */
-	buf3 = 160;	/* T3193 (units of 10ms) */
-	buf4 = 5;	/* T3195 */
-	buf5 = 10;	/* N3101 */
-	buf6 = 4;	/* N3103 */
-	buf7 = 8;	/* N3105 */
-	buf8 = 15;	/* RLC CV countdown */
-	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, 9, buf);
+	rlc_cfg = (struct abis_nm_ipacc_att_rlc_cfg){
+		.t3142 =		20,	/* T3142 */
+		.t3169 =		5,	/* T3169 */
+		.t3191 =		5,	/* T3191 */
+		.t3193_10ms =		160,	/* T3193 (units of 10ms) */
+		.t3195 =		5,	/* T3195 */
+		.n3101 =		10,	/* N3101 */
+		.n3103 =		4,	/* N3103 */
+		.n3105 =		8,	/* N3105 */
+		.rlc_cv_countdown =	15,	/* RLC CV countdown */
+	};
+	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG, sizeof(rlc_cfg), (const uint8_t *)&rlc_cfg);
 
 	if (bts->gprs.mode == BTS_GPRS_EGPRS) {
 		buf0 = 0x8f;
@@ -190,18 +202,21 @@
 	}
 	msgb_tl16v_put(msgb, NM_ATT_IPACC_CODING_SCHEMES, 2, buf);
 
-	buf0 = 0;	/* T downlink TBF extension (0..500, high byte) */
-	buf1 = 250;	/* T downlink TBF extension (0..500, low byte) */
-	buf2 = 0;	/* T uplink TBF extension (0..500, high byte) */
-	buf3 = 250;	/* T uplink TBF extension (0..500, low byte) */
-	buf4 = 2;	/* CS2 */
-	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, 5, buf);
+	rlc_cfg_2 = (struct abis_nm_ipacc_att_rlc_cfg_2){
+		.t_dl_tbf_ext_10ms = htons(250), /* 0..500 */
+		.t_ul_tbf_ext_10ms = htons(250), /* 0..500 */
+		.initial_cs = 2, /* CS2 */
+	};
+	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_2, sizeof(rlc_cfg_2), (const uint8_t *)&rlc_cfg_2);
 
 #if 0
 	/* EDGE model only, breaks older models.
 	 * Should inquire the BTS capabilities */
-	buf0 = 2;		/* MCS2 */
-	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, 1, buf);
+	struct abis_nm_ipacc_att_rlc_cfg_3 rlc_cfg_3;
+	rlc_cfg_3 = (struct abis_nm_ipacc_att_rlc_cfg_3){
+		.initial_mcs = 2, /* MCS2 */
+	};
+	msgb_tl16v_put(msgb, NM_ATT_IPACC_RLC_CFG_3, sizeof(rlc_cfg_3), (const uint8_t *)&rlc_cfg_3);
 #endif
 
 	return msgb;

Changes of Revision 181