Robert Schmidt
3e6e9f449c
Merge remote-tracking branch 'origin/fix-develop-segvs' into integration_2022_wk15
2022-04-09 13:10:00 +02:00
Robert Schmidt
9151666960
Merge remote-tracking branch 'origin/nr_gold_init_improv' into integration_2022_wk15
2022-04-09 13:09:50 +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
Laurent THOMAS
f46240ca2b
fix code review remarks
2022-04-08 18:22:38 +02:00
francescomani
680c605e32
Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM
2022-04-08 17:02:35 +02:00
francescomani
1ab64d26aa
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-08 16:50:02 +02:00
Robert Schmidt
6ad71e290a
Comment unused function that have been introduced in this integration branch
2022-04-08 11:30:19 +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
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
c65593d088
Fix build after merge
2022-04-06 11:06: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
francescomani
4f486ce66b
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-06 11:02:53 +02:00
francescomani
f0ea21476a
Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report
2022-04-06 10:04:20 +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
Mario Hudon
147efc44e1
Merge remote-tracking branch 'oai-eurecom/develop' into NR_UE_thread_improvement_IDCC
2022-04-04 14:51:15 -04:00
luis_pereira87
29f47c49c1
Fix segmentation fault for NSA
2022-04-04 11:05:52 +01:00
francescomani
0152e8ce38
fix dlsim compilation error
2022-04-03 20:26:05 +02:00
Robert Schmidt
ec82ddea38
Don't call calculate_preferred_dl_tda() in do-ra mode
...
In --do-ra mode, calculate_preferred_dl_tda() would be called without a
BWP. Then, get_searchspace() would search in the scc, leading to a
segfault. Therefore, don't call calculate_preferred_dl_tda() in do-ra
mode.
2022-04-03 19:25:14 +02:00
francescomani
7901ff998d
Merge remote-tracking branch 'origin/develop' into NR_handling_PMI_report
2022-04-03 16:38:32 +02:00
francescomani
ed9c35a170
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-04-03 16:20:59 +02:00
francescomani
03510c83b7
Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv
2022-04-03 15:33:30 +02:00
francescomani
33d153f132
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-04-01 19:42:28 +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
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
Robert Schmidt
30f14c7e55
Rename dummy eNB function to make GTP compile in 4G (no SDAP)
2022-04-01 13:35:40 +02:00
athanassopoulos
a826af5839
SDAP Initial Implementation
2022-04-01 13:35:40 +02:00
Robert Schmidt
8eb22e7262
Remove duplicate statements
2022-04-01 11:44:33 +02:00
francescomani
6e6f9a53a1
Merge remote-tracking branch 'origin/develop' into NR_dl_ul_fapi_improv
2022-03-31 10:46:02 +02:00
francescomani
cb32c7505e
tabulated values * 10 to simplify the code
2022-03-30 19:08:20 +02: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
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
Raymond Knopp
9bd16f3c66
- fix for CSI-RS allocation (slot slot 0 in symbol 13, SIB1 10 symbols instead of 12 by default)
...
- extra logging for CRNTI procedure (to catch bug in nr_free_list
2022-03-28 21:45:50 +02:00
francescomani
6e48ec9266
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-28 18:32:59 +02:00
Robert Schmidt
ab654ac15c
Merge remote-tracking branch 'origin/force-256qam-off' into integration_2022_wk13
2022-03-28 17:48:22 +02:00
rmagueta
8e5ea001b1
Fix warning after merge
2022-03-28 11:57:29 +01:00
rmagueta
c11f6082a6
Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2022-03-28 11:57:07 +01:00
rmagueta
3b3866feee
Fix warning after merge
2022-03-28 11:17:59 +01:00
rmagueta
9daef4e587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2022-03-28 11:17:00 +01:00
Laurent THOMAS
c0568a997a
fix bugs, delete dead code
2022-03-28 12:05:18 +02:00