rmagueta
2f753873bc
Fix warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
2022-04-30 16:12:27 +01:00
rmagueta
751335765f
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/RRC/NR/nr_rrc_config.c
2022-04-30 15:52:48 +01:00
rmagueta
4b3aa7233e
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-30 15:14:20 +01:00
Robert Schmidt
4389fdea4e
Harmonize NSA DMRS AdditionalPosition with SA
2022-04-26 18:26:09 +02:00
Robert Schmidt
48cb251044
Merge remote-tracking branch 'origin/NR_SR_fixes' into integration_2022_wk17
2022-04-26 16:29:25 +02:00
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
28c3205f22
Merge remote-tracking branch 'origin/fix-rfsim-ue4G-sync' into integration_2022_wk17
...
Conflicts:
targets/ARCH/rfsimulator/simulator.c
2022-04-26 15:16:09 +02:00
Robert Schmidt
327ccc0895
Merge remote-tracking branch 'origin/fix-ue-dlsch' into integration_2022_wk17
2022-04-26 15:12:26 +02:00
Robert Schmidt
df3674c129
Merge remote-tracking branch 'origin/bugfix-nr-rlc-status-generation' into develop
...
Conflicts:
openair2/LAYER2/nr_rlc/nr_rlc_entity_am.c
2022-04-26 14:13:51 +02:00
Robert Schmidt
532bb0da96
Remove useless comments
2022-04-22 17:54:41 +02:00
Cedric Roux
4b4e419aba
nr rlc: fix NR RLC AM status generation
...
Several problems were found and fixed.
2022-04-21 16:47:27 +02:00
francescomani
33663e68b0
rename frame_type
2022-04-19 18:37:14 +02:00
Cedric Roux
8b0be9cf87
nr rlc: speedup ack/nack reception
...
The code completely changed, expect problems.
2022-04-15 12:20:02 +02:00
francescomani
ca51ba7d3f
ignoring PUCCH2 TPC for now
2022-04-14 19:30:22 +02:00
rmagueta
ad3253fef6
Move CSI-RS configuration from fill_initial_SpCellConfig to update_cellGroupConfig
2022-04-13 19:45:10 +01:00
rmagueta
27bac2f2c4
The RI, PMI and CQI estimated at the UE are sent by the UE and correctly received by the gNB
2022-04-13 15:33:37 +01:00
Laurent THOMAS
b2560daa3d
merge develop and fix one double free bug in nr_dlschsim
2022-04-13 15:15:11 +02:00
rmagueta
9b1db62f38
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
2022-04-13 10:40:58 +01:00
rmagueta
a81640a6df
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ue.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2022-04-13 10:21:09 +01:00
rmagueta
40279dddf3
Get cri_bitlen, ri_bitlen, pmi_bitlen and cqi_bitlen at UE
2022-04-13 01:07:01 +01:00
rmagueta
04b234c878
Send CSI-RS measurements from PHY to MAC at UE
2022-04-12 19:06:02 +01:00
Mario Hudon
06b637c1cf
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UE_thread_improvement_IDCC
2022-04-12 12:59:27 -04:00
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
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
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
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
Laurent THOMAS
f46240ca2b
fix code review remarks
2022-04-08 18:22:38 +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
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
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
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
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
03510c83b7
Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv
2022-04-03 15:33:30 +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
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
rmagueta