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

Merge remote-tracking branch 'origin/NR_UE_sanitize_PUCCH2' into integration_2023_w41

Browse Source
This commit is contained in:
Robert Schmidt
2023-10-12 20:57:48 +02:00
parent 838b284aa4 8d2b8895df
commit e3b3495488
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
+4 -1
View File
@@ -759,7 +759,10 @@ void nr_generate_pucch2(const PHY_VARS_NR_UE *ue,
for (int l=0; l<pucch_pdu->nr_of_symbols; l++) { for (int l=0; l<pucch_pdu->nr_of_symbols; l++) {
// c_init calculation according to TS38.211 subclause // c_init calculation according to TS38.211 subclause
x2 = (((1<<17)*((14*nr_slot_tx) + (l+startingSymbolIndex) + 1)*((2*pucch_pdu->dmrs_scrambling_id) + 1)) + (2*pucch_pdu->dmrs_scrambling_id))%(1U<<31); uint64_t temp_x2 = 1ll << 17;
temp_x2 *= 14UL * nr_slot_tx + l + startingSymbolIndex + 1;
temp_x2 *= 2UL * pucch_pdu->dmrs_scrambling_id + 1;
x2 = (temp_x2 + 2UL * pucch_pdu->dmrs_scrambling_id) % (1UL << 31);
int reset = 1; int reset = 1;
for (int ii=0; ii<=(startingPRB>>2); ii++) { for (int ii=0; ii<=(startingPRB>>2); ii++) {
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1 -1
View File
@@ -1560,7 +1560,7 @@ int get_deltatf(uint16_t nb_of_prbs,
{ {
int DELTA_TF; int DELTA_TF;
int O_CRC = compute_pucch_crc_size(O_UCI); int O_CRC = compute_pucch_crc_size(O_UCI);
int N_symb = nb_symbols_excluding_dmrs[N_symb_PUCCH-4][add_dmrs_flag][freq_hop_flag]; int N_symb = N_symb_PUCCH < 4 ? N_symb_PUCCH : nb_symbols_excluding_dmrs[N_symb_PUCCH - 4][add_dmrs_flag][freq_hop_flag];
float N_RE = nb_of_prbs * N_sc_ctrl_RB * N_symb; float N_RE = nb_of_prbs * N_sc_ctrl_RB * N_symb;
float K1 = 6; float K1 = 6;
if (O_UCI + O_CRC < 12) if (O_UCI + O_CRC < 12)