[MERGED] osmo-bts[master]: osmo-bts-trx: Fix PCS1900 operation

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Harald Welte gerrit-no-reply at lists.osmocom.org
Mon Aug 8 17:46:13 UTC 2016


Harald Welte has submitted this change and it was merged.

Change subject: osmo-bts-trx: Fix PCS1900 operation
......................................................................


osmo-bts-trx: Fix PCS1900 operation

As the ARFCN numbers in DCS (1800) and PCS (1900) are not unique,
we need to specify the band in the upper bits of the ARFCN value before
calling gsm_arfcn2freq10().

Change-Id: I637b76bc1fc749eed8e364412d76606589991c02
---
M src/osmo-bts-trx/trx_if.c
1 file changed, 12 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved; Verified



diff --git a/src/osmo-bts-trx/trx_if.c b/src/osmo-bts-trx/trx_if.c
index bef6c09..42d383c 100644
--- a/src/osmo-bts-trx/trx_if.c
+++ b/src/osmo-bts-trx/trx_if.c
@@ -288,11 +288,16 @@
 
 int trx_if_cmd_rxtune(struct trx_l1h *l1h, uint16_t arfcn)
 {
+	struct phy_instance *pinst = l1h->phy_inst;
 	uint16_t freq10;
+
+	if (pinst->trx->bts->band == GSM_BAND_1900)
+		arfcn |= ARFCN_PCS;
 
 	freq10 = gsm_arfcn2freq10(arfcn, 1); /* RX = uplink */
 	if (freq10 == 0xffff) {
-		LOGP(DTRX, LOGL_ERROR, "Arfcn %d not defined.\n", arfcn);
+		LOGP(DTRX, LOGL_ERROR, "Arfcn %d not defined.\n",
+		     arfcn & ~ARFCN_FLAG_MASK);
 		return -ENOTSUP;
 	}
 
@@ -301,11 +306,16 @@
 
 int trx_if_cmd_txtune(struct trx_l1h *l1h, uint16_t arfcn)
 {
+	struct phy_instance *pinst = l1h->phy_inst;
 	uint16_t freq10;
+
+	if (pinst->trx->bts->band == GSM_BAND_1900)
+		arfcn |= ARFCN_PCS;
 
 	freq10 = gsm_arfcn2freq10(arfcn, 0); /* TX = downlink */
 	if (freq10 == 0xffff) {
-		LOGP(DTRX, LOGL_ERROR, "Arfcn %d not defined.\n", arfcn);
+		LOGP(DTRX, LOGL_ERROR, "Arfcn %d not defined.\n",
+		     arfcn & ~ARFCN_FLAG_MASK);
 		return -ENOTSUP;
 	}
 

-- 
To view, visit https://gerrit.osmocom.org/650
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I637b76bc1fc749eed8e364412d76606589991c02
Gerrit-PatchSet: 3
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder



More information about the gerrit-log mailing list