Osmocom Open Build Service

osmo-bts.spec Changed

commit_07c3d8635638e0bd2e5a22998e5cf904a0dbe445.txt Deleted

commit_805340cb9ce5cd12ac63b132d0e4216c00dd9773.txt Added

osmo-bts_1.6.0.145.07c3.dsc -> osmo-bts_1.6.0.147.8053.dsc Changed

@@ -2,7 +2,7 @@
 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.145.07c3
+Version: 1.6.0.147.8053
 Maintainer: Osmocom team <openbsc@lists.osmocom.org>
 Homepage: https://projects.osmocom.org/projects/osmobts
 Standards-Version: 3.9.8
@@ -17,8 +17,8 @@
  osmo-bts-virtual deb net optional arch=any
  osmo-bts-virtual-dbg deb debug extra arch=any
 Checksums-Sha1:
- 8fad0d7688be3bf4bdf7ce07b15107ab621258db 473848 osmo-bts_1.6.0.145.07c3.tar.xz
+ 63e52e2f0a2e4679b2fab1a457b2f69086ce1b3b 474240 osmo-bts_1.6.0.147.8053.tar.xz
 Checksums-Sha256:
- d74aaa5b7241719f53d6cfb42b91036b2e5334d826c8f570386f0453fc1af5d0 473848 osmo-bts_1.6.0.145.07c3.tar.xz
+ 339a8ec0c9d2df44044dff48f48c0ea2465b509cb2377700db995bf57c8b66df 474240 osmo-bts_1.6.0.147.8053.tar.xz
 Files:
- 45abd7d1be8ab295dc928726b6c1be1a 473848 osmo-bts_1.6.0.145.07c3.tar.xz
+ 4d67ecab889cfddc7aeb648b43ce9283 474240 osmo-bts_1.6.0.147.8053.tar.xz

osmo-bts_1.6.0.145.07c3.tar.xz/.tarball-version -> osmo-bts_1.6.0.147.8053.tar.xz/.tarball-version Changed

osmo-bts_1.6.0.145.07c3.tar.xz/debian/changelog -> osmo-bts_1.6.0.147.8053.tar.xz/debian/changelog Changed

osmo-bts_1.6.0.145.07c3.tar.xz/src/osmo-bts-sysmo/l1_if.c -> osmo-bts_1.6.0.147.8053.tar.xz/src/osmo-bts-sysmo/l1_if.c Changed

@@ -1228,6 +1228,121 @@
 	return l1if_handle_ind(fl1h, msg);
 }
 
+static void mute_handle_ts(struct gsm_bts_trx_ts *ts, int is_muted)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(ts->lchan); i++) {
+		struct gsm_lchan *lchan = &ts->lchani;
+
+		if (!is_muted)
+			continue;
+
+		if (lchan->state != LCHAN_S_ACTIVE)
+			continue;
+
+		/* skip channels that might be active for another reason */
+		if (lchan->type == GSM_LCHAN_CCCH)
+			continue;
+		if (lchan->type == GSM_LCHAN_PDTCH)
+			continue;
+
+		if (lchan->s <= 0)
+			continue;
+
+		lchan->s = 0;
+		rsl_tx_conn_fail(lchan, RSL_ERR_RADIO_LINK_FAIL);
+	}
+}
+
+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(3, 6, 0)
+static int mute_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp,
+			    void *data)
+{
+	struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
+	SuperFemto_Prim_t *sysp = msgb_sysprim(resp);
+	GsmL1_Status_t status;
+
+	status = sysp->u.muteRfCnf.status;
+
+	if (status != GsmL1_Status_Success) {
+		LOGP(DL1C, LOGL_ERROR, "Rx RF-MUTE.conf with status %s\n",
+		     get_value_string(femtobts_l1status_names, status));
+		if (trx->mo.fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)
+			oml_mo_rf_lock_chg(&trx->mo, fl1h->last_rf_mute, 0);
+	} else {
+		int i;
+
+		LOGP(DL1C, LOGL_INFO, "Rx RF-MUTE.conf with status=%s\n",
+		     get_value_string(femtobts_l1status_names, status));
+		bts_update_status(BTS_STATUS_RF_MUTE, fl1h->last_rf_mute0);
+		if (trx->mo.fi->state != NM_RCARRIER_ST_OP_DISABLED_NOTINSTALLED)
+			oml_mo_rf_lock_chg(&trx->mo, fl1h->last_rf_mute, 1);
+
+		osmo_static_assert(
+			ARRAY_SIZE(trx->ts) >= ARRAY_SIZE(fl1h->last_rf_mute),
+			ts_array_size);
+
+		for (i = 0; i < ARRAY_SIZE(fl1h->last_rf_mute); ++i)
+			mute_handle_ts(&trx->tsi, fl1h->last_rf_mutei);
+	}
+
+	msgb_free(resp);
+
+	return 0;
+}
+#endif
+
+/* mute/unmute RF time slots */
+int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute8, l1if_compl_cb *cb)
+{
+
+	LOGP(DL1C, LOGL_INFO, "Tx RF-MUTE.req (%d, %d, %d, %d, %d, %d, %d, %d)\n",
+	     mute0, mute1, mute2, mute3,
+	     mute4, mute5, mute6, mute7
+	    );
+
+#if SUPERFEMTO_API_VERSION < SUPERFEMTO_API(3, 6, 0)
+	const uint8_t unmuted8 = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	struct gsm_bts_trx *trx = hdl->phy_inst->trx;
+	int i;
+	LOGP(DL1C, LOGL_ERROR, "RF-MUTE.req not supported by SuperFemto\n");
+	/* always acknowledge an un-MUTE (which is a no-op if MUTE is not supported */
+	if (!memcmp(mute, unmuted, ARRAY_SIZE(unmuted))) {
+		bts_update_status(BTS_STATUS_RF_MUTE, mute0);
+		oml_mo_rf_lock_chg(&trx->mo, mute, 1);
+		for (i = 0; i < ARRAY_SIZE(unmuted); ++i)
+			mute_handle_ts(&trx->tsi, mutei);
+		return 0;
+	}
+	return -ENOTSUP;
+#else
+	struct msgb *msg = sysp_msgb_alloc();
+	SuperFemto_Prim_t *sysp = msgb_sysprim(msg);
+	sysp->id = SuperFemto_PrimId_MuteRfReq;
+	memcpy(sysp->u.muteRfReq.u8Mute, mute, sizeof(sysp->u.muteRfReq.u8Mute));
+	/* save for later use */
+	memcpy(hdl->last_rf_mute, mute, sizeof(hdl->last_rf_mute));
+
+	return l1if_req_compl(hdl, msg, cb ? cb : mute_rf_compl_cb, NULL);
+#endif /* < 3.6.0 */
+}
+
+static int activate_rf_mute_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp, void *data)
+{
+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(3, 6, 0)
+	mute_rf_compl_cb(trx, resp, data);
+#endif
+
+	/* signal availability */
+	osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);
+	osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);
+
+	return 0;
+}
+
+int trx_rf_lock(struct gsm_bts_trx *trx, int locked, l1if_compl_cb *cb);
+
 static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp,
 				void *data)
 {
@@ -1254,10 +1369,11 @@
 			bts_shutdown(trx->bts, "RF-ACT failure");
 		} else {
 			bts_update_status(BTS_STATUS_RF_ACTIVE, 1);
-
-			/* signal availability */
-			osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT, NULL);
-			osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT, NULL);
+#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(3, 6, 0)
+			trx_rf_lock(trx, 1, activate_rf_mute_compl_cb);
+#else
+			activate_rf_mute_compl_cb(trx, resp, NULL);
+#endif
 		}
 	} else {
 		bts_update_status(BTS_STATUS_RF_ACTIVE, 0);
@@ -1356,104 +1472,6 @@
 	return l1if_req_compl(hdl, msg, activate_rf_compl_cb, NULL);
 }
 
-static void mute_handle_ts(struct gsm_bts_trx_ts *ts, int is_muted)
-{
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(ts->lchan); i++) {
-		struct gsm_lchan *lchan = &ts->lchani;
-
-		if (!is_muted)
-			continue;
-
-		if (lchan->state != LCHAN_S_ACTIVE)
-			continue;
-
-		/* skip channels that might be active for another reason */
-		if (lchan->type == GSM_LCHAN_CCCH)
-			continue;
-		if (lchan->type == GSM_LCHAN_PDTCH)
-			continue;
-
-		if (lchan->s <= 0)
-			continue;
-
-		lchan->s = 0;
-		rsl_tx_conn_fail(lchan, RSL_ERR_RADIO_LINK_FAIL);
-	}
-}
-
-#if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(3,6,0)
-static int mute_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp,
-			    void *data)
-{
-	struct femtol1_hdl *fl1h = trx_femtol1_hdl(trx);
-	SuperFemto_Prim_t *sysp = msgb_sysprim(resp);
-	GsmL1_Status_t status;
-
-	status = sysp->u.muteRfCnf.status;
-
-	if (status != GsmL1_Status_Success) {
-		LOGP(DL1C, LOGL_ERROR, "Rx RF-MUTE.conf with status %s\n",
-		     get_value_string(femtobts_l1status_names, status));
-		oml_mo_rf_lock_chg(&trx->mo, fl1h->last_rf_mute, 0);
-	} else {
-		int i;
-
-		LOGP(DL1C, LOGL_INFO, "Rx RF-MUTE.conf with status=%s\n",
-		     get_value_string(femtobts_l1status_names, status));
-		bts_update_status(BTS_STATUS_RF_MUTE, fl1h->last_rf_mute0);
-		oml_mo_rf_lock_chg(&trx->mo, fl1h->last_rf_mute, 1);
-
-		osmo_static_assert(
-			ARRAY_SIZE(trx->ts) >= ARRAY_SIZE(fl1h->last_rf_mute),
-			ts_array_size);
-
-		for (i = 0; i < ARRAY_SIZE(fl1h->last_rf_mute); ++i)
-			mute_handle_ts(&trx->tsi, fl1h->last_rf_mutei);
-	}
-
-	msgb_free(resp);
-
-	return 0;
-}
-#endif
-
-/* mute/unmute RF time slots */
-int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute8, l1if_compl_cb *cb)
-{
-
-	LOGP(DL1C, LOGL_INFO, "Tx RF-MUTE.req (%d, %d, %d, %d, %d, %d, %d, %d)\n",
-	     mute0, mute1, mute2, mute3,
-	     mute4, mute5, mute6, mute7
-	    );
-
-#if SUPERFEMTO_API_VERSION < SUPERFEMTO_API(3,6,0)
-	const uint8_t unmuted8 = { 0,0,0,0,0,0,0,0 };
-	struct gsm_bts_trx *trx = hdl->phy_inst->trx;
-	int i;
-	LOGP(DL1C, LOGL_ERROR, "RF-MUTE.req not supported by SuperFemto\n");
-	/* always acknowledge an un-MUTE (which is a no-op if MUTE is not supported */
-	if (!memcmp(mute, unmuted, ARRAY_SIZE(unmuted))) {
-		bts_update_status(BTS_STATUS_RF_MUTE, mute0);
-		oml_mo_rf_lock_chg(&trx->mo, mute, 1);
-		for (i = 0; i < ARRAY_SIZE(unmuted); ++i)
-			mute_handle_ts(&trx->tsi, mutei);
-		return 0;
-	}
-	return -ENOTSUP;
-#else
-	struct msgb *msg = sysp_msgb_alloc();
-	SuperFemto_Prim_t *sysp = msgb_sysprim(msg);
-	sysp->id = SuperFemto_PrimId_MuteRfReq;
-	memcpy(sysp->u.muteRfReq.u8Mute, mute, sizeof(sysp->u.muteRfReq.u8Mute));
-	/* save for later use */
-	memcpy(hdl->last_rf_mute, mute, sizeof(hdl->last_rf_mute));
-
-	return l1if_req_compl(hdl, msg, cb ? cb : mute_rf_compl_cb, NULL);
-#endif /* < 3.6.0 */
-}
-
 /* call-back on arrival of DSP+FPGA version + band capability */
 static int info_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp,
 			 void *data)

osmo-bts_1.6.0.145.07c3.tar.xz/src/osmo-bts-sysmo/oml.c -> osmo-bts_1.6.0.147.8053.tar.xz/src/osmo-bts-sysmo/oml.c Changed

Changes of Revision 123