Commit Graph
8236 Commits
Author SHA1 Message Date
Robert Schmidt b97d26cb86 Merge remote-tracking branch 'origin/NR_SA_UID' into integration_2022_wk07_c 2022-02-17 09:02:16 +01:00
Melissa Elkadi 5637b62ed8 Return in gNB if pdu_len is less than cast length
This is what we did in the NRUE for NSA mode
2022-02-16 16:26:41 -08:00
Melissa Elkadi c917352dd2 Resolving issues in MR:
Adding error checking before indexing in mac layer harq array
Adding error checking before writing ul_harq_sfn_slot
Added comments
Made a "static" free_uci_inds() actually static
2022-02-16 16:11:19 -08:00
francescomani 8c1ed65c1f Merge remote-tracking branch 'origin/develop' into NR_MIMO_memory 2022-02-16 13:46:54 +01:00
Robert Schmidt 9a7154f3d4 Merge remote-tracking branch 'origin/fairRR-sched-debug' into integration_2022_wk07_c 2022-02-16 10:34:36 +01:00
Melissa Elkadi 679816c3c1 Added comment around asn1cCalloc memory leak 2022-02-15 15:05:04 -08:00
Melissa Elkadi 39d9febc0c Hardcoding TI and UL_CQI in stub function.
Also, the allocation of the eNB measurement
report keeps getting commented out becasue
the compiler throws an error. I have un-commented
the allocation of memory (becasue it breaks NSA
mode) and added a memset to ensure we are using
the allocated memory. This gets rid of the
warning and ensures NSA mode still works.
2022-02-15 08:39:55 -08:00
Melissa Elkadi e461ab51a1 Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-14 16:16:43 -08:00
Melissa Elkadi 6de93fbb59 Only assigning harq_pid in emulated L1 mode. 2022-02-14 16:15:39 -08:00
Melissa Elkadi abddc13a13 Adding \n to several logs and demoting two logs 2022-02-14 13:51:57 -08:00
Melissa Elkadi 5e7de1cdfc Fixing typo and adding .h files for linking 2022-02-14 11:41:22 -08:00
francescomani c645c12db4 using uid also in SA 2022-02-14 20:28:05 +01:00
Melissa Elkadi af18fc7e70 Log demotion and white space clean up 2022-02-14 11:14:13 -08:00
Melissa Elkadi 26349dbe20 More clean up for merge request 2022-02-14 11:07:14 -08:00
Melissa Elkadi 987363b8a8 Clean up for MR 2022-02-14 10:34:23 -08:00
francescomani ec4ae32af0 N1 N2 and XP for DL antenna ports in config file 2022-02-14 19:00:55 +01:00
francescomani db257fd5a9 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-14 18:29:09 +01:00
francescomani f1260a09e6 some fixes for phy-test mode 2022-02-14 17:40:57 +01:00
luis_pereira87 7e1b38db13 Fix segmentation fault in phy-test 2022-02-14 14:03:05 +00:00
luis_pereira87 fdc2cb8716 Fix pucch resource calculation 2022-02-14 13:11:03 +00:00
luis_pereira87 6436f77aa0 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 2022-02-14 10:20:42 +00:00
francescomani 4329051120 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-14 09:20:22 +01:00
francescomani de88c3f45c Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-14 08:57:52 +01:00
francescomani 67efa202e2 call to config_csirs also in sa 2022-02-11 19:32:40 +01:00
francescomani 9237cb545c passing UECAP structure to RRC reconfiguration functions 2022-02-11 18:57:48 +01:00
francescomani d2a559f91e improvements in config_csirs 2022-02-11 18:35:26 +01:00
Robert Schmidt 7e92d44fc2 Merge remote-tracking branch 'origin/oai-ue-time-meas' into integration_2022_wk06_a 2022-02-10 18:57:28 +01:00
Melissa Elkadi df06a1e8e4 Merge branch 'episys/master-sa' into episys/mel/debug-thorughput-new-sa-master 2022-02-09 16:20:22 -08:00
Melissa Elkadi 4c950bb006 Resetting dl_config->number_pdus in NRUE scheduler 2022-02-09 14:06:55 -08:00
Melissa Elkadi 9322701ce4 Need a break if we queue a ul_tti_req based on PDU state
If we dont have this break we are trying to queue
the UL_TTI_REQ we just queued
2022-02-09 13:32:09 -08:00
Melissa Elkadi 60a9d41bc6 UCI ACK/NACK most of the way working
We have gotten rid of filling the ACK/NACK with
the DLSCH and now only fill with the PUCCH. This
assumes that the MAC layer is properly decoding the
dl_tti_req and tx_data_req and allows us to
simply use the MAC layers scheduled SNF/Slot
to return the ACK NACK. There are some hacks added
in this commit which ensure that the PDCP packet
has the correct header (1st byte = 80) and now with
15Mbps we are seeing about 20% packet loss and
a gNB bug on the edge case (current frame is 1023
and the gNB schduler wants an ACK in frame 0 but the
scheduled UL_TTI_REQ has a frame of 1023).
2022-02-09 07:59:10 -08:00
luis_pereira87 3dce1171d5 Fixes after merge 2022-02-09 11:16:38 +00:00
luis_pereira87 9610b7124c Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
2022-02-09 11:10:31 +00:00
Melissa fb3e3ea6e5 Merge branch 'episys/david/adding_NR_to_NUM_MCS' into 'episys/master-nsa'
Added NR to NUM_MCS for nr channel modeling.

See merge request aburger/openairinterface5g!109
2022-02-08 15:56:44 -08:00
Melissa 8c2a067a22 Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
Downlink SISO modeling

See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Melissa Elkadi 9da3cbc9ec Cherry picking UCI multiplexing for CSI reports 2022-02-08 13:03:13 -08:00
Melissa Elkadi 62b525c579 TODO: Revert this change after discussion with OAI 2022-02-08 11:59:54 -08:00
Melissa Elkadi b897287d1f Changes made to gNB cause emulated-L1 mode not to work for multiple UEs.
It seems that the RA procedure in the gNB was modified so
the RAR is sent in a single tx_data_req. The emualted mode
was not previously handling this. We now only process the
PDU in the rx_ind that has a matching preamble. If any
other PDUs exist, we ignore them and only build Msg3 based
on this single matching RAR PDU.

Also, two bug fixes applied here in the emulate-l1 mode.
2022-02-08 11:59:04 -08:00
Melissa Elkadi f518b9d61f Merge branch 'eurecom-develop' into episys-ul-info-cleanup 2022-02-08 09:39:13 -08:00
Robert Schmidt a36555b254 Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a 2022-02-08 18:06:53 +01:00
francescomani 9ff39f0d92 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2022-02-08 16:48:20 +01:00
francescomani 37a517edb7 Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz 2022-02-08 16:18:27 +01:00
francescomani 46ca8cc2d0 Merge remote-tracking branch 'origin/develop' into NR_RRC_256QAM_DL 2022-02-08 16:01:59 +01:00
francescomani dd9f285cb7 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-02-08 15:37:39 +01:00
Robert Schmidt 8e6e4d8237 Log inactivity timer 2022-02-08 14:45:05 +01:00
Robert Schmidt 5bdaeb5718 Stop scheduling DL on UL failure or out of sync 2022-02-08 14:45:05 +01:00
Robert Schmidt 388cfafea8 Stop scheduling in UL after ul_failure_timer 2022-02-08 14:45:05 +01:00
Robert Schmidt eca14f6ec9 Schedule UL 5 RBs at MCS 10 on inactivity 2022-02-08 14:45:00 +01:00
rmagueta e8657ec854 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-02-08 09:31:32 +00:00
francescomani 90bc226ac0 Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling 2022-02-08 08:48:04 +01:00