LC15/sysmobts: Don't try to refer to fl1h from PHY config

At the time the phy link / phy instance level VTY configuration
commands are parsed, we did not yet call l1if_open() and thus
pinst->u.{lc15,sysmobts}.hdl == NULL.

PHY or PHY instance specific configuration must thus be stored inside
the phy_link or phy_instance itself, and not inside the (not yet
existing) handle.

We solve this by moving around some parameters:
* clk_use_eeprom/clk_cal/clk_src/calib_path get replicated in
  phy_instance
* min_qual_{rach,norm} are moved into the generic part (which means
  that osmo-bts-octphy and osmo-bts-trx should also implement them)

1 files changed, 0 insertions, 28 deletions

diff --git a/src/osmo-bts-sysmo/main.c b/src/osmo-bts-sysmo/main.c
index 68143bb4..e54ba468 100644
--- a/src/osmo-bts-sysmo/main.c
+++ b/src/osmo-bts-sysmo/main.c
@@ -56,32 +56,6 @@
 
 extern int pcu_direct;
 
-/* Set the clock calibration to the value
- * read from the eeprom.
- */
-void clk_cal_use_eeprom(struct gsm_bts *bts)
-{
-	int rc;
-	struct femtol1_hdl *hdl;
-	eeprom_RfClockCal_t rf_clk;
-
-	hdl = bts->c0->role_bts.l1h;
-
-	if (!hdl || !hdl->clk_use_eeprom)
-		return;
-
-	rc = eeprom_ReadRfClockCal(&rf_clk);
-	if (rc != EEPROM_SUCCESS) {
-		LOGP(DL1C, LOGL_ERROR, "Failed to read from EEPROM.\n");
-		return;
-	}
-
-	hdl->clk_cal = rf_clk.iClkCor;
-	LOGP(DL1C, LOGL_NOTICE,
-		"Read clock calibration(%d) from EEPROM.\n", hdl->clk_cal);
-}
-
-
 int bts_model_init(struct gsm_bts *bts)
 {
 	struct gsm_bts_role_bts *btsb;
@@ -99,8 +73,6 @@ int bts_model_init(struct gsm_bts *bts)
 		exit(1);
 	}
 
-	clk_cal_use_eeprom(bts);
-
 	if (stat(SYSMOBTS_RF_LOCK_PATH, &st) == 0) {
 		LOGP(DL1C, LOGL_NOTICE, "Not starting BTS due to RF_LOCK file present\n");
 		exit(23);