rmagueta
1d86347587
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_TRANSPORT/nr_dci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-12 14:48:08 +01:00
rmagueta
d5421a9c87
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/NR_REFSIG/nr_refsig.h
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-04-12 14:02:43 +01:00
francescomani
11ced194cd
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-04-12 10:28:32 +02:00
francescomani
02b66061b1
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-12 10:14:21 +02:00
francescomani
4452308184
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-12 09:40:52 +02:00
luis_pereira87
0689040770
Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into Dedicated-BWPs
2022-04-11 13:50:32 +01:00
luis_pereira87
940abc3587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
2022-04-11 13:49:40 +01:00
Laurent Thomas
95a58d646a
merge develop, no test
2022-04-10 22:22:52 +02:00
Raymond Knopp
86b5b9db3d
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-09 19:44:26 +02:00
Robert Schmidt
d2053ec378
Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into integration_2022_wk15
2022-04-09 13:09:40 +02:00
rmagueta
3969079fcd
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/GNB_APP/gnb_paramdef.h
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2022-04-08 19:49:40 +01:00
rmagueta
8c056ceefc
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-04-08 18:19:06 +01:00
francescomani
1ab64d26aa
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-08 16:50:02 +02:00
Raymond Knopp
5962824038
Integrate true reporting of buffer availability of RLC(DU) towards the CU
2022-04-07 16:34:16 +02:00
Laurent THOMAS
2cdc7304f1
merge develop
2022-04-07 10:00:41 +02:00
Robert Schmidt
054688ade4
Merge remote-tracking branch 'origin/nr_sdap' into integration_2022_wk14
2022-04-06 23:45:07 +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
luis_pereira87
2b1cafb509
Do not create a Dedicated BWP when it is not configured in the configuration file
2022-04-06 18:06:02 +01:00
Laurent THOMAS
293a53e373
code review remarks, cannot perform full test (develop bugged)
2022-04-06 17:07:25 +02:00
rmagueta
4ee6005a50
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-04-06 13:30:04 +01:00
rmagueta
eb03322545
Change LOG level
2022-04-06 13:18:46 +01:00
luis_pereira87
1a3c8e5440
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-04-06 11:52:55 +01:00
rmagueta
345f3056ff
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-04-06 10:51:43 +01:00
rmagueta
4f29c73bb6
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-06 10:11:49 +01:00
francescomani
4f486ce66b
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-06 11:02:53 +02:00
matzakos
0eb2acb00b
F1 code cleanup before merge
...
-Remove commented out code, debug logs, some hardcodings, fix indentation
2022-04-06 10:43:09 +02:00
luis_pereira87
6ccaaacaf0
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-04-05 12:46:14 +01:00
luis_pereira87
4d257e1a99
Fix build after merge
2022-04-05 12:03:22 +01:00
luis_pereira87
f8af4c8b72
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-05 11:47:23 +01:00
francescomani
4c17c9c62a
change SR slot in FDD to avoid assertion
2022-04-03 18:15:17 +02:00
francescomani
ed9c35a170
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-03 16:20:59 +02:00
rmagueta
e628c8c2c4
Fix build after merge
2022-04-01 20:13:06 +01:00
rmagueta
2deec7fa09
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-01 19:36:57 +01:00
francescomani
33d153f132
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-04-01 19:42:28 +02:00
francescomani
e1e8c167de
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-04-01 19:21:45 +02:00
Robert Schmidt
5d63a756e6
Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b
2022-04-01 18:40:30 +02:00
rmagueta
25614263ba
Fix build after merge
2022-04-01 16:15:58 +01:00
athanassopoulos
cf30f61e65
Changes to SDAP code
...
1. Removed SDAP struct from protocol context.
2. Added configuration for the SDAP.
3. SDAP doesn't use pdcp_entities, the values come from function arguements.
4. Make nr_pdcp_ue_manager accessible from SDAP.
5. Avoid using the PDCP locking mechanism in SDAP.
6. Removed nr_pdcp_find_entity_sdap function.
7. Rename dummy eNB function to make GTP compile (no SDAP).
8. Fix: Regression issues with LTE
9. Fix: Regression issues with NR CU/DU
2022-04-01 17:04:08 +02:00
rmagueta
c83df1b677
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# 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
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
athanassopoulos
a826af5839
SDAP Initial Implementation
2022-04-01 13:35:40 +02:00
Thomas Schlichter
729cf143e0
Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS
2022-04-01 10:28:11 +02:00
rmagueta
da1e542a31
Fix dl_antenna_ports after merge
2022-03-30 20:14:57 +01:00
rmagueta
4c0427ea6c
Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# 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
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-03-30 19:23:22 +01:00
Raphael Defosseux
426ded6e31
fix(build): fix warnings on circular dependency
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2022-03-30 16:42:12 +02:00
Raymond Knopp
10b4f4331e
CQI report in slots 7/27
2022-03-29 23:10:08 +02:00
Raymond Knopp
b7389ab3d1
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-29 22:57:56 +02:00
Melissa Elkadi
8e90e7415a
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-29 13:41:35 -07:00
Robert Schmidt
69fcab9243
Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into integration_2022_wk13
2022-03-29 22:09:34 +02:00
Raymond Knopp
a77c1d3202
Trigger first DL Data Delivery status from DU to report the buffer availability to the CU
...
-After that no DL traffic is getting blocked at the Accelleran CU for low values of throughput
-Remaining to remove the hardcoded value of buffer availability and report the actual value from the DU.
2022-03-29 12:17:37 +02:00
Raymond Knopp
65bea43111
Merge branch 'tdd25period_for_MR' of https://gitlab.eurecom.fr/oai/openairinterface5g into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/pucch_rx.c
2022-03-28 21:55:24 +02:00