maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for DAS handled via index based analog beamforming

Browse Source
This commit is contained in:
francescomani
2026-03-19 14:01:33 +01:00
parent 46b7670672
commit e6e5c481d9
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+3 -2
View File
@@ -72,11 +72,12 @@ int beam_index_allocation(bool das,
{ {
if (!common_vars->beam_id) if (!common_vars->beam_id)
return 0; return 0;
if (das)
return fapi_beam_index;
AssertFatal(IS_BIT_SET(fapi_beam_index, 15), "Can't handle preconfigured DBM yet\n"); AssertFatal(IS_BIT_SET(fapi_beam_index, 15), "Can't handle preconfigured DBM yet\n");
int ru_beam_idx = fapi_beam_index & 0x7fff; int ru_beam_idx = fapi_beam_index & 0x7fff;
if (das)
return ru_beam_idx;
int idx = -1; int idx = -1;
for (int j = 0; j < common_vars->num_beams_period; j++) { for (int j = 0; j < common_vars->num_beams_period; j++) {
// L2 analog beam implementation is slot based, so we need to verify occupancy for the whole slot // L2 analog beam implementation is slot based, so we need to verify occupancy for the whole slot
openair2/GNB_APP/gnb_config.c
+13 -4
View File
@@ -1638,13 +1638,15 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
beam_info->beams_per_period = beams_per_period; beam_info->beams_per_period = beams_per_period;
beam_info->beam_allocation_size = -1; // to be initialized once we have information on frame configuration beam_info->beam_allocation_size = -1; // to be initialized once we have information on frame configuration
} }
bool das_enabled = false;
if (NFAPI_MODE == NFAPI_MONOLITHIC) {
GET_PARAMS_LIST(L1_ParamList, L1_Params, L1PARAMS_DESC, CONFIG_STRING_L1_LIST, NULL);
das_enabled = *(L1_ParamList.paramarray[j][L1_ANALOG_DAS].uptr);
}
// TODO config_isparamset doesn't seem to work for array types, checking numelt instead // TODO config_isparamset doesn't seem to work for array types, checking numelt instead
int n = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].numelt; int n = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].numelt;
if (n > 0) { if (n > 0) {
if (NFAPI_MODE == NFAPI_MONOLITHIC) { AssertFatal(!das_enabled, "No need to set beam weights in case of DAS\n");
GET_PARAMS_LIST(L1_ParamList, L1_Params, L1PARAMS_DESC, CONFIG_STRING_L1_LIST, NULL);
AssertFatal(*(L1_ParamList.paramarray[j][L1_ANALOG_DAS].uptr) == 0, "No need to set beam weights in case of DAS\n");
}
int num_beam = n; int num_beam = n;
if (RC.nrmac[j]->beam_info.beam_mode == PRECONFIGURED_BEAM_IDX) { if (RC.nrmac[j]->beam_info.beam_mode == PRECONFIGURED_BEAM_IDX) {
AssertFatal(n % num_tx == 0, "Error! Number of beam input needs to be multiple of TX antennas\n"); AssertFatal(n % num_tx == 0, "Error! Number of beam input needs to be multiple of TX antennas\n");
@@ -1658,6 +1660,13 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
config.bw_list = calloc_or_fail(n, sizeof(*config.bw_list)); config.bw_list = calloc_or_fail(n, sizeof(*config.bw_list));
for (int b = 0; b < n; b++) for (int b = 0; b < n; b++)
config.bw_list[b] = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].iptr[b]; config.bw_list[b] = MacRLC_ParamList.paramarray[j][MACRLC_BEAMWEIGHTS_IDX].iptr[b];
} else if (das_enabled) {
n = *MacRLC_ParamList.paramarray[j][MACRLC_ANALOG_BEAMS_PERIOD_IDX].u8ptr;
config.nb_bfw[0] = num_tx; // number of tx antennas
config.nb_bfw[1] = n; // number of beams weights/indices
config.bw_list = calloc_or_fail(n, sizeof(*config.bw_list));
for (int b = 0; b < n; b++)
config.bw_list[b] = b;
} }
// triggers also PHY initialization in case we have L1 via FAPI // triggers also PHY initialization in case we have L1 via FAPI
nr_mac_config_scc(RC.nrmac[j], scc, &config); nr_mac_config_scc(RC.nrmac[j], scc, &config);