makiandClaude Opus 4.7
7cd72323af
Brings the O-RAN compliant antenna muting feature (originally introduced
on the 'new' branch) onto the latest upstream 2026.w17 tag.
Files added:
openair1/PHY/NR_TRANSPORT/nr_antenna_state.{c,h}
openair1/PHY/NR_TRANSPORT/nr_antenna_control.{c,h}
Files modified (integration hooks):
CMakeLists.txt, executables/nr-gnb.c
openair1/PHY/INIT/nr_init.c, openair1/PHY/defs_gNB.h
openair1/PHY/MODULATION/{beamforming.c,nr_modulation.h,nr_beamforming.c}
openair1/SCHED_NR/nr_ru_procedures.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_{primitives,dlsch,uci}.c
Conflicts resolved:
- defs_gNB.h: kept upstream's new headers + appended antenna_state.h
- nr_init.c: dropped reference to upstream-removed nr_srs_info init,
kept nr_init_antenna_state() call
- beamforming.c: upstream moved nr_beam_precoding into new file
nr_beamforming.c; nr_beam_precoding_with_muting added there with
upstream's signature (no slot param)
- nr_modulation.h: aligned _with_muting decl to upstream signature
- nr_ru_procedures.c: muting check applied around upstream's new
fft_shift in nr_feptx, and around per-port memcpy in nr_feptx_prec
- gNB_scheduler_uci.c: SINR-based MCS hint uses get_dl_nrOfLayers(NULL,
sched_ctrl, ...) since nrmac is not in scope at the call site
- mac_proto.h: get_dl_nrOfLayers signature updated to take gNB_MAC_INST*
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
60 lines
2.4 KiB
C
60 lines
2.4 KiB
C
/*
|
|
* SPDX-License-Identifier: LicenseRef-CSSL-1.0
|
|
*/
|
|
|
|
#include "nr_modulation.h"
|
|
#include "openair1/PHY/TOOLS/tools_defs.h"
|
|
#include "PHY/NR_TRANSPORT/nr_antenna_state.h"
|
|
#include "common/utils/LOG/log.h"
|
|
|
|
void nr_beam_precoding(c16_t **txdataF,
|
|
c16_t **txdataF_BF,
|
|
NR_DL_FRAME_PARMS *frame_parms,
|
|
int32_t ***beam_weights,
|
|
int symbol,
|
|
int aa,
|
|
int nb_antenna_ports,
|
|
int offset)
|
|
{
|
|
// clear txdata_BF[aa][re] for each call of ue_spec_beamforming
|
|
memset(&txdataF_BF[aa][symbol*frame_parms->ofdm_symbol_size], 0, sizeof(c16_t) *(frame_parms->ofdm_symbol_size));
|
|
|
|
for (int p = 0; p < nb_antenna_ports; p++) {
|
|
multadd_cpx_vector((c16_t *)&txdataF[p][(symbol * frame_parms->ofdm_symbol_size) + offset],
|
|
(c16_t *)beam_weights[p][aa],
|
|
(c16_t *)&txdataF_BF[aa][symbol * frame_parms->ofdm_symbol_size],
|
|
frame_parms->ofdm_symbol_size,
|
|
15);
|
|
}
|
|
}
|
|
|
|
void nr_beam_precoding_with_muting(c16_t **txdataF,
|
|
c16_t **txdataF_BF,
|
|
NR_DL_FRAME_PARMS *frame_parms,
|
|
int32_t ***beam_weights,
|
|
int symbol,
|
|
int aa,
|
|
int nb_antenna_ports,
|
|
int offset,
|
|
const nr_antenna_state_t *ant_state)
|
|
{
|
|
// Clear output buffer first
|
|
memset(&txdataF_BF[aa][symbol * frame_parms->ofdm_symbol_size], 0,
|
|
sizeof(c16_t) * frame_parms->ofdm_symbol_size);
|
|
// O-RAN energy saving: skip precoding if antenna is muted
|
|
// This implements transmission blanking per WG4 spec
|
|
if (ant_state != NULL && !nr_is_tx_antenna_active(ant_state, aa)) {
|
|
LOG_D(PHY, "[ANTENNA_MUTE] Antenna %d muted, blanking transmission for symbol %d\n",
|
|
aa, symbol);
|
|
return;
|
|
}
|
|
// Normal precoding for active antennas
|
|
for (int p = 0; p < nb_antenna_ports; p++) {
|
|
multadd_cpx_vector((c16_t *)&txdataF[p][(symbol * frame_parms->ofdm_symbol_size) + offset],
|
|
(c16_t *)beam_weights[p][aa],
|
|
(c16_t *)&txdataF_BF[aa][symbol * frame_parms->ofdm_symbol_size],
|
|
frame_parms->ofdm_symbol_size,
|
|
15);
|
|
}
|
|
}
|