NR UE: support nr_get_carrier_frequencies() on constant PHY_VARS_NR_UE

This commit is contained in:
Thomas Schlichter
2026-01-26 11:41:33 +01:00
parent 877b8ed0a0
commit eed98b2bf9
2 changed files with 4 additions and 17 deletions
@@ -260,17 +260,7 @@ bool nr_search_ssb_common(nr_ssb_search_params_t *params);
@param dl_Carrier Pointer to DL carrier to be set @param dl_Carrier Pointer to DL carrier to be set
@param ul_Carrier Pointer to UL carrier to be set @param ul_Carrier Pointer to UL carrier to be set
*/ */
void nr_get_carrier_frequencies(PHY_VARS_NR_UE *ue, void nr_get_carrier_frequencies(const PHY_VARS_NR_UE *ue, uint64_t *dl_Carrier, uint64_t *ul_Carrier);
uint64_t *dl_Carrier,
uint64_t *ul_Carrier);
/*!
\brief This function gets the carrier frequencies either from FP or command-line-set global variables, depending on the availability of the latter
@param ue Pointer to PHY UE
@param sl_Carrier Pointer to SL carrier to be set
*/
void nr_get_carrier_frequencies_sl(PHY_VARS_NR_UE *ue,
uint64_t *sl_Carrier);
/*! /*!
\brief This function sets the OAI RF card rx/tx params \brief This function sets the OAI RF card rx/tx params
@@ -34,9 +34,9 @@
extern PHY_VARS_NR_UE ***PHY_vars_UE_g; extern PHY_VARS_NR_UE ***PHY_vars_UE_g;
void nr_get_carrier_frequencies(PHY_VARS_NR_UE *ue, uint64_t *dl_carrier, uint64_t *ul_carrier){ void nr_get_carrier_frequencies(const PHY_VARS_NR_UE *ue, uint64_t *dl_carrier, uint64_t *ul_carrier)
{
NR_DL_FRAME_PARMS *fp = &ue->frame_parms; const NR_DL_FRAME_PARMS *fp = &ue->frame_parms;
if (ue->if_freq!=0) { if (ue->if_freq!=0) {
*dl_carrier = ue->if_freq; *dl_carrier = ue->if_freq;
*ul_carrier = *dl_carrier + ue->if_freq_off; *ul_carrier = *dl_carrier + ue->if_freq_off;
@@ -47,9 +47,6 @@ void nr_get_carrier_frequencies(PHY_VARS_NR_UE *ue, uint64_t *dl_carrier, uint64
} }
} }
void nr_rf_card_config_gain(openair0_config_t *openair0_cfg) void nr_rf_card_config_gain(openair0_config_t *openair0_cfg)
{ {
uint8_t mod_id = 0; uint8_t mod_id = 0;