[MERGED] osmo-bts[master]: sysmo: don't override clock source with defaults

[Max]

Max has submitted this change and it was merged.

Change subject: sysmo: don't override clock source with defaults
......................................................................


sysmo: don't override clock source with defaults

Previously clock source configured via vty was ignored. Check that it
wasn't configured and only apply default value in that case.

Change-Id: I8de74a12d2096971a8a83946dc6c7cdb9889acd7
Fixes: OS#1944
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 14 insertions(+), 11 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 3d28644..44ba3de 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1640,19 +1640,22 @@
 	clk_cal_use_eeprom(fl1h);
 	get_hwinfo_eeprom(fl1h);
 #if SUPERFEMTO_API_VERSION >= SUPERFEMTO_API(2,1,0)
-	if (fl1h->hw_info.model_nr == 2050) {
-		/* On the sysmoBTS 2050, we don't have an OCXO but
-		 * start with the TCXO and will sync it with the PPS
-		 * of the GPS in case there is a fix. */
-		fl1h->clk_src = SuperFemto_ClkSrcId_Tcxo;
-		LOGP(DL1C, LOGL_INFO, "Clock source defaulting to GPS 1PPS "
-			"on sysmoBTS 2050\n");
-	} else {
-		/* default clock source: OCXO */
-		fl1h->clk_src = SuperFemto_ClkSrcId_Ocxo;
+	if (fl1h->clk_src == SuperFemto_ClkSrcId_None) {
+		if (fl1h->hw_info.model_nr == 2050) {
+			/* On the sysmoBTS 2050, we don't have an OCXO but
+			 * start with the TCXO and will sync it with the PPS
+			 * of the GPS in case there is a fix. */
+			fl1h->clk_src = SuperFemto_ClkSrcId_Tcxo;
+			LOGP(DL1C, LOGL_INFO, "Clock source defaulting to GPS 1PPS "
+			     "on sysmoBTS 2050\n");
+		} else {
+			/* default clock source: OCXO */
+			fl1h->clk_src = SuperFemto_ClkSrcId_Ocxo;
+		}
 	}
 #else
-	fl1h->clk_src = SF_CLKSRC_OCXO;
+	if (fl1h->clk_src == SF_CLKSRC_NONE)
+		fl1h->clk_src = SF_CLKSRC_OCXO;
 #endif
 
 	rc = l1if_transport_open(MQ_SYS_WRITE, fl1h);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8de74a12d2096971a8a83946dc6c7cdb9889acd7
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>