osmith has uploaded this change for review.

View Change

osmo-bts-sysmo/l1_if: move mute_rf_compl_cb up

Prepare to use it in a new function above activate_rf_compl_cb.

Change-Id: I19dbfbd595d3b42c0634a4c38e39cdb314a54266
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 74 insertions(+), 63 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/33463/1

diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 0a1bbf3..3a22b47 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1228,6 +1228,69 @@
 	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->lchan[i];
+
+		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_mute[0]);
+		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->ts[i], fl1h->last_rf_mute[i]);
+	}
+
+	msgb_free(resp);
+
+	return 0;
+}
+#endif
+
 static int activate_rf_compl_cb(struct gsm_bts_trx *trx, struct msgb *resp,
 				void *data)
 {
@@ -1356,69 +1419,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->lchan[i];
-
-		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_mute[0]);
-		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->ts[i], fl1h->last_rf_mute[i]);
-	}
-
-	msgb_free(resp);
-
-	return 0;
-}
-#endif
-
 /* mute/unmute RF time slots */
 int l1if_mute_rf(struct femtol1_hdl *hdl, uint8_t mute[8], l1if_compl_cb *cb)
 {

To view, visit change 33463. To unsubscribe, or for help writing mail filters, visit settings.