diff options
| author | Harald Welte <laforge@gnumonks.org> | 2016-01-20 22:50:06 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2016-02-15 14:27:29 +0100 |
| commit | e9a17292e8545d5f651e9614c43bc1626e10ac5f (patch) | |
| tree | 6e2cf1ae92d8c4cd6de786eb4f0f3aab18f9ef91 /include | |
| parent | 9b5cff87ecc4b76f9f8a0a86aa64e9394e2a8374 (diff) | |
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)
Diffstat (limited to 'include')
| -rw-r--r-- | include/osmo-bts/gsm_data.h | 3 | ||||
| -rw-r--r-- | include/osmo-bts/phy_link.h | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index f9e6ed13..c4953cbb 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -104,6 +104,9 @@ struct gsm_bts_role_bts { struct llist_head queue; /* list of struct smscb_msg */ struct smscb_msg *cur_msg; /* current SMS-CB */ } smscb_state; + + float min_qual_rach; /* minimum quality for RACH bursts */ + float min_qual_norm; /* minimum quality for normal daata */ }; enum lchan_ciph_state { diff --git a/include/osmo-bts/phy_link.h b/include/osmo-bts/phy_link.h index 73d57749..e31971e6 100644 --- a/include/osmo-bts/phy_link.h +++ b/include/osmo-bts/phy_link.h @@ -82,7 +82,13 @@ struct phy_instance { union { struct { + /* configuration */ + uint8_t clk_use_eeprom; uint32_t dsp_trace_f; + int clk_cal; + uint8_t clk_src; + char *calib_path; + struct femtol1_hdl *hdl; } sysmobts; struct { @@ -93,7 +99,10 @@ struct phy_instance { uint32_t trx_id; } octphy; struct { + /* configuration */ uint32_t dsp_trace_f; + char *calib_path; + struct lc15l1_hdl *hdl; } lc15; } u; |