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

Merge remote-tracking branch 'origin/remove-globals-nas' into integration_2024_w23

Browse Source
This commit is contained in:
Robert Schmidt
2024-06-06 08:40:30 +02:00
parent d58bedaed1 7aec889cf6
commit 4e4a59b5bc
8 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_llr_computation.c
-2
View File
@@ -38,8 +38,6 @@
//#define DEBUG_LLR_SIC
int16_t nr_zeros[8] __attribute__((aligned(16))) = {0, 0, 0, 0, 0, 0, 0, 0};
//==============================================================================================
// SINGLE-STREAM
//==============================================================================================
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
-19
View File
@@ -186,22 +186,3 @@ void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, n
pucch_vars->active[i] = false;
}
}
int dummy_csi_status = 0;
uint32_t dummy_csi_payload = 0;
/* FFS TODO_NR code that should be removed */
void set_csi_nr(int csi_status, uint32_t csi_payload)
{
dummy_csi_status = csi_status;
if (dummy_csi_status == 0) {
dummy_csi_payload = 0;
}
else {
dummy_csi_payload = csi_payload;
}
}
openair1/SCHED_NR_UE/pucch_uci_ue_nr.h
-2
View File
@@ -52,6 +52,4 @@
void pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, const UE_nr_rxtx_proc_t *proc, nr_phy_data_tx_t *phy_data, c16_t **txdataF);
void set_csi_nr(int csi_status, uint32_t csi_payload);
#endif /* PUCCH_UCI_UE_NR_H */
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
-2
View File
@@ -1074,8 +1074,6 @@ int test_csi_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *proc)
ue->dlsch[proc->thread_id][gNB_id][0]->current_harq_pid = NR_MAX_DLSCH_HARQ_PROCESSES;
set_csi_nr( 4, 0x0E );
printf("\n => Test : PUCCH format from dedicated config with CSI alone \n");
if (pucch_procedures_ue_nr(ue, gNB_id, proc, reset_harq) != true) {