Osmocom Open Build Service

osmo-pcu.spec Changed

osmo-pcu_1.3.1.9.26dc.202311242026.dsc -> osmo-pcu_1.3.1.10.4695.202311252026.dsc Changed

@@ -2,7 +2,7 @@
 Source: osmo-pcu
 Binary: osmo-pcu, osmo-pcu-dbg, osmo-pcu-doc
 Architecture: any all
-Version: 1.3.1.9.26dc.202311242026
+Version: 1.3.1.10.4695.202311252026
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: http://osmocom.org/projects/osmopcu
 Standards-Version: 3.9.8
@@ -14,8 +14,8 @@
  osmo-pcu-dbg deb debug extra arch=any
  osmo-pcu-doc deb doc optional arch=all
 Checksums-Sha1:
- b987309c3bc127054b9bfe172a2fc14097bf5036 429480 osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz
+ 85ed4883358b5be544f55a2a6932a1b36e1f520b 427952 osmo-pcu_1.3.1.10.4695.202311252026.tar.xz
 Checksums-Sha256:
- ca1e7f3553d32c0b5a6c8a78b317fa495af0ca99b90cdba06363fd85fc46c37e 429480 osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz
+ eb916c73543041e991dc2905a3341d3116b7b0d5239a848d70389335dce4bbd9 427952 osmo-pcu_1.3.1.10.4695.202311252026.tar.xz
 Files:
- c8958f80f31874607c0e45f50287d759 429480 osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz
+ 484926256e943877ff3fe061620f42c1 427952 osmo-pcu_1.3.1.10.4695.202311252026.tar.xz

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/.tarball-version -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/.tarball-version Changed

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/contrib/osmo-pcu.spec.in -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/contrib/osmo-pcu.spec.in Changed

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/debian/changelog -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/debian/changelog Changed

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/debian/control -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/debian/control Changed

@@ -16,7 +16,7 @@
 
 Package: osmo-pcu
 Architecture: any
-Depends: osmocom-nightly (= 202311242026), ${shlibs:Depends}, ${misc:Depends}
+Depends: osmocom-nightly (= 202311252026), ${shlibs:Depends}, ${misc:Depends}
 Description: Osmocom GPRS/EDGE Packet Control Unit (PCU)
  The GPRS Packet Control Unit is co-located with the GSM BTS or GSM BSC
  in order to provide packet-switched services for 2G (2.5G, 2.75G)
@@ -28,7 +28,7 @@
 Architecture: any
 Section: debug
 Priority: extra
-Depends: osmocom-nightly (= 202311242026), osmo-pcu (= ${binary:Version}),
+Depends: osmocom-nightly (= 202311252026), osmo-pcu (= ${binary:Version}),
          ${misc:Depends}
 Description: Debug symbols for the Osmocom GPRS/EDGE Packet Control Unit (PCU)
  The GPRS Packet Control Unit is co-located with the GSM BTS or GSM BSC
@@ -41,7 +41,7 @@
 Architecture: all
 Section: doc
 Priority: optional
-Depends: osmocom-nightly (= 202311242026), ${misc:Depends}
+Depends: osmocom-nightly (= 202311252026), ${misc:Depends}
 Description: ${misc:Package} PDF documentation
  Various manuals: user manual, VTY reference manual and/or
  protocol/interface manuals.

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/src/bts.h -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/src/bts.h Changed

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/src/gprs_rlcmac_sched.cpp -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/src/gprs_rlcmac_sched.cpp Changed

osmo-pcu_1.3.1.9.26dc.202311242026.tar.xz/src/pcu_l1_if.cpp -> osmo-pcu_1.3.1.10.4695.202311252026.tar.xz/src/pcu_l1_if.cpp Changed

@@ -551,11 +551,10 @@
 	const unsigned num_tbfs = pdch->num_tbfs(GPRS_RLCMAC_DL_TBF)
 				+ pdch->num_tbfs(GPRS_RLCMAC_UL_TBF);
 	bool skip_idle = (num_tbfs == 0);
-#ifdef ENABLE_DIRECT_PHY
-		/* In DIRECT_PHY mode we want to always submit something to L1 in
-		 * TRX0, since BTS is not preparing dummy bursts on idle TS for us: */
+
+	if (bts->gen_idle_blocks)
 		skip_idle = skip_idle && trx != 0;
-#endif
+
 	if (skip_idle) {
 		pcu_l1if_tx_ptcch(bts, trx, ts, bts->trxtrx.arfcn, fn, block_nr,
 				  NULL, 0);
@@ -735,6 +734,27 @@
 	{ 0, NULL }
 };
 
+static bool decide_gen_idle_blocks(struct gprs_rlcmac_bts *bts)
+{
+	switch (bts->bts_model) {
+	case PCU_IF_BTS_MODEL_UNSPEC:
+	case PCU_IF_BTS_MODEL_LC15:
+	case PCU_IF_BTS_MODEL_OC2G:
+	case PCU_IF_BTS_MODEL_OCTPHY:
+	case PCU_IF_BTS_MODEL_SYSMO:
+	case PCU_IF_BTS_MODEL_RBS:
+		/* The BTS models above do not generate dummy blocks by themselves, so OsmoPCU must fill the idle gaps in the
+		 * stream of generated PDCH blocks with dummy blocks. */
+		return true;
+	case PCU_IF_BTS_MODEL_TRX:
+		/* The BTS models above generate dummy blocks by themselves, so OsmoBTS will only generate PDCH bloks that
+		 * actually contain data. On idle, no blocks are generated. */
+	        return false;
+	default:
+		return false;
+	}
+}
+
 static int pcu_rx_info_ind(struct gprs_rlcmac_bts *bts, const struct gsm_pcu_if_info_ind *info_ind)
 {
 	struct gprs_bssgp_pcu *pcu;
@@ -946,6 +966,7 @@
 
 	LOGP(DL1IF, LOGL_INFO, "BTS model: %s\n", get_value_string(gsm_pcuif_bts_model_names, info_ind->bts_model));
 	bts->bts_model = info_ind->bts_model;
+	bts->gen_idle_blocks = decide_gen_idle_blocks(bts);
 
 	bts->active = true;
 	return rc;

Changes of Revision 525