Osmocom Open Build Service

osmo-bts.spec Changed

commit_84d220abc1c577ac273c0612cc03812ba353983f.txt Deleted

commit_d53a084fd67454912aa093774ec9f896fddc8d06.txt Added

osmo-bts_1.6.0.164.84d2.dsc Deleted

@@ -1,24 +0,0 @@
-Format: 3.0 (native)
-Source: osmo-bts
-Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc
-Architecture: any all
-Version: 1.6.0.164.84d2
-Maintainer: Osmocom team <openbsc@lists.osmocom.org>
-Homepage: https://projects.osmocom.org/projects/osmobts
-Standards-Version: 3.9.8
-Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
-Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
-Build-Depends: debhelper (>= 10), pkg-config, dh-autoreconf, autotools-dev, libosmocore-dev (>= 1.8.0), libosmo-abis-dev (>= 1.4.0), libosmo-netif-dev (>= 1.3.0), libgps-dev, txt2man, osmo-gsm-manuals-dev (>= 1.4.0)
-Package-List:
- osmo-bts deb net optional arch=any
- osmo-bts-doc deb doc optional arch=all
- osmo-bts-trx deb net optional arch=any
- osmo-bts-trx-dbg deb debug extra arch=any
- osmo-bts-virtual deb net optional arch=any
- osmo-bts-virtual-dbg deb debug extra arch=any
-Checksums-Sha1:
- 8196586c7ff8baac0751dab0375e749f29b4ad3f 477148 osmo-bts_1.6.0.164.84d2.tar.xz
-Checksums-Sha256:
- a00c9c61952aebbdab642af0eda843d3560a89752f0af17a70bd328d29d01038 477148 osmo-bts_1.6.0.164.84d2.tar.xz
-Files:
- edde38d8848293dbc042af6f840911c3 477148 osmo-bts_1.6.0.164.84d2.tar.xz

osmo-bts_1.6.0.166.d53a0.dsc Added

@@ -0,0 +1,24 @@
+Format: 3.0 (native)
+Source: osmo-bts
+Binary: osmo-bts, osmo-bts-trx, osmo-bts-trx-dbg, osmo-bts-virtual, osmo-bts-virtual-dbg, osmo-bts-doc
+Architecture: any all
+Version: 1.6.0.166.d53a0
+Maintainer: Osmocom team <openbsc@lists.osmocom.org>
+Homepage: https://projects.osmocom.org/projects/osmobts
+Standards-Version: 3.9.8
+Vcs-Browser: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
+Vcs-Git: https://gitea.osmocom.org/cellular-infrastructure/osmo-bts
+Build-Depends: debhelper (>= 10), pkg-config, dh-autoreconf, autotools-dev, libosmocore-dev (>= 1.8.0), libosmo-abis-dev (>= 1.4.0), libosmo-netif-dev (>= 1.3.0), libgps-dev, txt2man, osmo-gsm-manuals-dev (>= 1.4.0)
+Package-List:
+ osmo-bts deb net optional arch=any
+ osmo-bts-doc deb doc optional arch=all
+ osmo-bts-trx deb net optional arch=any
+ osmo-bts-trx-dbg deb debug extra arch=any
+ osmo-bts-virtual deb net optional arch=any
+ osmo-bts-virtual-dbg deb debug extra arch=any
+Checksums-Sha1:
+ 18c1fa25680438e6bec31086714a272f0a1a73b0 476700 osmo-bts_1.6.0.166.d53a0.tar.xz
+Checksums-Sha256:
+ 9da0eeeca672f64f3cd393470ad31030f881d180f211153e0e8a64550b63b9e9 476700 osmo-bts_1.6.0.166.d53a0.tar.xz
+Files:
+ b63e7739ef0f82014501ff3d33b54bb8 476700 osmo-bts_1.6.0.166.d53a0.tar.xz

osmo-bts_1.6.0.164.84d2.tar.xz/.tarball-version -> osmo-bts_1.6.0.166.d53a0.tar.xz/.tarball-version Changed

osmo-bts_1.6.0.164.84d2.tar.xz/debian/changelog -> osmo-bts_1.6.0.166.d53a0.tar.xz/debian/changelog Changed

osmo-bts_1.6.0.164.84d2.tar.xz/src/common/bts.c -> osmo-bts_1.6.0.166.d53a0.tar.xz/src/common/bts.c Changed

@@ -791,6 +791,13 @@
 		return true;
 	case RSL_CMOD_SPD_SPEECH:
 		break;
+	case RSL_CMOD_SPD_DATA:
+	default:
+		return false;
+	}
+
+	/* Stage 1: check support for the requested channel type */
+	switch (cm->chan_rt) {
 	case RSL_CMOD_CRT_TCH_GROUP_Bm:
 	case RSL_CMOD_CRT_TCH_GROUP_Lm:
 		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VGCS))
@@ -801,21 +808,19 @@
 		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VBS))
 			return false;
 		break;
-	case RSL_CMOD_SPD_DATA:
-	default:
-		return false;
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm:
+	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm:
+		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS))
+			return false;
+		break;
 	}
 
-	/* Before the requested pchan/cm combination can be checked, we need to
-	 * convert it to a feature identifier we can check */
+	/* Stage 2: check support for the requested codec */
 	switch (cm->chan_rt) {
 	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Bm:
-		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS))
-			return false;
-		/* fall-through */
-	case RSL_CMOD_CRT_TCH_Bm:
 	case RSL_CMOD_CRT_TCH_GROUP_Bm:
 	case RSL_CMOD_CRT_TCH_BCAST_Bm:
+	case RSL_CMOD_CRT_TCH_Bm:
 		switch (cm->chan_rate) {
 		case RSL_CMOD_SP_GSM1:
 			feature	= BTS_FEAT_SPEECH_F_V1;
@@ -833,12 +838,9 @@
 		break;
 
 	case RSL_CMOD_CRT_OSMO_TCH_VAMOS_Lm:
-		if (!osmo_bts_has_feature(bts->features, BTS_FEAT_VAMOS))
-			return false;
-		/* fall-through */
-	case RSL_CMOD_CRT_TCH_Lm:
 	case RSL_CMOD_CRT_TCH_GROUP_Lm:
 	case RSL_CMOD_CRT_TCH_BCAST_Lm:
+	case RSL_CMOD_CRT_TCH_Lm:
 		switch (cm->chan_rate) {
 		case RSL_CMOD_SP_GSM1:
 			feature	= BTS_FEAT_SPEECH_H_V1;

osmo-bts_1.6.0.164.84d2.tar.xz/src/common/measurement.c -> osmo-bts_1.6.0.166.d53a0.tar.xz/src/common/measurement.c Changed

@@ -72,7 +72,15 @@
 			/* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are
 			 * SUB */
 			return true;
+		case GSM48_CMODE_DATA_12k0: /* TCH/F9.6 */
+		case GSM48_CMODE_DATA_6k0: /* TCH/F4.8 */
+			/* FIXME: In case of data traffic channels TCH/F9.6 and TCH/F4.8 the
+			 * RXQUAL_SUB report shall include measurements on the TDMA frames given
+			 * in the table of subclause 8.3 only if L2 fill frames have been received
+			 * as FACCH/F frames at the corresponding frame positions. */
 		default:
+			if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA)
+				return false;
 			LOGPLCFN(lchan, fn, DMEAS, LOGL_ERROR, "Unsupported lchan->tch_mode %u\n", lchan->tch_mode);
 			break;
 		}
@@ -87,7 +95,15 @@
 			/* No DTX allowed; SUB=FULL, therefore measurements at all frame numbers are
 			 * SUB */
 			return true;
+		case GSM48_CMODE_DATA_6k0: /* TCH/H4.8 */
+		case GSM48_CMODE_DATA_3k6: /* TCH/H2.4 */
+			/* FIXME: In case of data traffic channels TCH/H4.8 and TCH/H2.4 the
+			 * RXQUAL_SUB report shall include measurements on the TDMA frames given
+			 * in the table of subclause 8.3 only if L2 fill frames have been received
+			 * as FACCH/H frames at the corresponding frame positions. */
 		default:
+			if (lchan->rsl_cmode == RSL_CMOD_SPD_DATA)
+				return false;
 			LOGPLCFN(lchan, fn, DMEAS, LOGL_ERROR, "Unsupported lchan->tch_mode %u\n", lchan->tch_mode);
 			break;
 		}

Changes of Revision 130