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
c4f1812cc9
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-02-14 18:14:19 +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
Raymond Knopp
4756c5a167
added configurable "sf_ahead" for NR/LTE in RU section. Tested in NR with sf_ahead=2 (normally 3)
2022-02-13 22:15:48 +01:00
Raymond Knopp
5ba8b83856
Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
...
Conflicts:
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB_nsa.c
openair2/RRC/NR/rrc_gNB_reconfig.c
targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp
da54df5bb2
Merge remote-tracking branch 'origin/develop' into harq_latency_control
...
Conflicts:
cmake_targets/phy_simulators
openair1/PHY/CODING/crc_byte.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/RRC/NR/rrc_gNB.c
2022-02-13 09:55:01 +01:00
Raymond Knopp
74fd3f029a
changes for AW2S NR support in ORI library
2022-02-13 09:44:15 +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
Raymond Knopp
b9b24588af
Merge remote-tracking branch 'origin/develop' into aw2s-n41
...
Conflicts:
cmake_targets/phy_simulators
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +01:00
luis_pereira87
5d488fcbfe
Merge remote-tracking branch 'origin/multiple-ues-min-prbs-bug-fix' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-02-11 10:06:39 +00: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
Robert Schmidt
0a6322103c
Reduce max_num_ue after successful PUCCH alloc
2022-02-10 12:44:26 +01:00
Robert Schmidt
571677b948
Make nr_find_nb_rb() take minimum RBsize
2022-02-10 12:43:54 +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
luis_pereira87
c1931a60e7
Bug fix in min num of PRBs to schedule to a UE when there is multiple UEs
2022-02-09 20:14:05 +00:00
luis_pereira87
06d07e3a4c
Bug fix in min num of PRBs to schedule to a UE when there is multiple UEs
2022-02-09 20:09:51 +00: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
Raymond Knopp
dccbd9279a
Some hardcoded values in F1AP for testing with Accelleran to be removed later
2022-02-09 11:05:23 +01: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