Robert Schmidt
5dc87bdcad
Merge remote-tracking branch 'origin/rename_frame_type' into integration_2022_wk17
2022-04-26 15:16:24 +02:00
Robert Schmidt
532bb0da96
Remove useless comments
2022-04-22 17:54:41 +02:00
francescomani
33663e68b0
rename frame_type
2022-04-19 18:37:14 +02:00
Laurent THOMAS
4ad71064b8
review comments
2022-04-11 19:29:45 +02:00
Laurent Thomas
95a58d646a
merge develop, no test
2022-04-10 22:22:52 +02:00
Laurent THOMAS
2cdc7304f1
merge develop
2022-04-07 10:00:41 +02:00
Robert Schmidt
d8d3106baf
Merge remote-tracking branch 'origin/episys-throughput-updates-and-downlink-siso-cm' into integration_2022_wk14
2022-04-06 23:44:59 +02:00
Robert Schmidt
288c29da84
Apply review suggestions
2022-03-24 14:39:16 +01:00
Laurent THOMAS
a7e7d05da3
fix difficult to read code
2022-03-24 14:38:17 +01:00
Melissa Elkadi
79cc21f6f5
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-07 06:33:51 -08:00
luis_pereira87
0d92901787
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-03-04 13:09:44 +00:00
Robert Schmidt
d6dc279439
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into integration_2022_wk09
2022-03-01 18:52:33 +01:00
Melissa Elkadi
2b1cc455b0
Merge branch 'episys-ul-info-cleanup' into episys/master-sa
2022-02-24 15:48:43 -08:00
francescomani
5c56bb21ce
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-23 15:08:52 +01:00
francescomani
ddfb131f68
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2022-02-23 14:55:33 +01:00
luis_pereira87
47fc4750e1
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-02-23 11:34:37 +00:00
luis_pereira87
fb6936fe27
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/NR/rrc_gNB.c
2022-02-21 11:00:27 +00:00
francescomani
3b7430a745
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-21 09:12:21 +01:00
Robert Schmidt
86c4882245
Merge remote-tracking branch 'origin/NR_2port_CSIRS' into integration_2022_wk08
2022-02-20 19:48:34 +01:00
Robert Schmidt
ff0fb53056
Merge remote-tracking branch 'origin/nr-fdd-scheduling' into integration_2022_wk07_c
2022-02-17 09:32:44 +01:00
Melissa Elkadi
5e7de1cdfc
Fixing typo and adding .h files for linking
2022-02-14 11:41:22 -08:00
Melissa Elkadi
987363b8a8
Clean up for MR
2022-02-14 10:34:23 -08:00
luis_pereira87
6436f77aa0
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-02-14 10:20:42 +00:00
francescomani
de88c3f45c
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-14 08:57:52 +01: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
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
francescomani
37a517edb7
Merge remote-tracking branch 'origin/develop' into NR_SA_10MHz
2022-02-08 16:18:27 +01:00
luis_pereira87
e39ad834c0
Fix dci size for formats 1_0 and 0_0 and improve procedures when using Coreset0
2022-02-04 15:20:24 +00:00
francescomani
434ee15ba0
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2022-02-03 11:38:14 +01:00
luis_pereira87
0166cd05d6
To use ServingCellConfigCommonSIB when ServingCellConfigCommon is NULL
2022-02-02 15:15:18 +00:00
francescomani
8202180a18
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2022-01-10 10:39:44 +01:00
rmagueta
cf8f6fdeed
Merge remote-tracking branch 'origin/develop' into develop-SRS
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/RRC/NR/L2_nr_interface.c
2022-01-08 12:11:56 +00:00
francescomani
d385c2126b
fixes for TDA in case of double symbol pdcch
2022-01-06 09:30:42 +01:00
francescomani
37a2d7af57
changes to allow pdsch typeb in sib1
2021-12-31 12:00:28 +01:00
francescomani
6f38108635
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-12-30 10:58:37 +01:00
Melissa Elkadi
e7ef264226
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-12-21 06:02:40 -08:00
francescomani
510a9d15dd
Merge remote-tracking branch 'origin/develop' into NR_UE_CSIRS_scheduling
2021-12-20 09:36:05 +01:00
francescomani
64b7741c16
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2021-12-17 09:18:17 +01:00
rmagueta
ec8ec353b6
Merge remote-tracking branch 'origin/develop' into develop-SRS
2021-12-16 10:10:53 +00:00
luis_pereira87
e0944aa24b
Fix Msg4 segmentation fault when UE_id is invalid and reset ul_failure when UE reconnects using C-RNTI
2021-12-07 11:40:24 +00:00
francescomani
7e1ebc3653
Merge remote-tracking branch 'origin/develop' into nr-fdd-scheduling
2021-12-07 10:07:40 +01:00
rmagueta
cce7ed5483
Remove obsolete code and fix build warnings
2021-11-22 18:35:52 +00:00
francescomani
1f75a9780d
scheduling of csi for im
2021-11-22 16:27:42 +01:00
rmagueta
9551cf4a82
Implementation of get_nr_srs_offset function to remove the hardcoded offset sl40
2021-11-22 14:27:22 +00:00
francescomani
2eac9f53c7
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-11-11 16:35:46 +01:00
Melissa Elkadi
fa4617c0bf
Fixing MR based on OAI feedback
...
The following was changed in this commit:
- A new struct in the mac instance was created
for all emulated L1 fields.
- NR UE RRC state bug was fixed
- Checking the RAR rnti based on the MAC instance
ra.ra_rnti and not hardcoding to 0x10b
- Modified the name of the new emulate_l2 flag
to make sense: emulate_l1
2021-11-08 10:59:28 -08:00
francescomani
3808937231
Merge remote-tracking branch 'origin/NR_UE_acknack' into nr-fdd-scheduling
2021-11-08 11:53:50 +01:00
Guido Casati
755c8d5055
Fixed calculation of num dmrs per prb at gnb side
...
- the param was hardcoded to 12 at gNB side
while it was computed at UE side
- the same function used at UE side has been moved to the common file
- now the computation at gNB side is consistent with the UE
2021-11-05 16:05:10 +01:00
Guido Casati
a5f18dbb20
Enhancements to the overall MAC logging
...
- updating to NR_MAC tag
- minor cleanups
- added more relavant info for debugging purposes
2021-11-05 16:05:10 +01:00