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
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
8c056ceefc
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-04-08 18:19:06 +01:00
Robert Schmidt
054688ade4
Merge remote-tracking branch 'origin/nr_sdap' into integration_2022_wk14
2022-04-06 23:45:07 +02: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
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
athanassopoulos
a826af5839
SDAP Initial Implementation
2022-04-01 13:35:40 +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
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
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
0abcf3d9c4
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/INIT/nr_init.c
# openair1/PHY/INIT/nr_init_ue.c
# openair1/PHY/NR_REFSIG/nr_gold.c
# openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-28 13:32:46 +01:00
rmagueta
495b3f39c5
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-03-28 10:12:29 +01:00
Robert Schmidt
7684803c64
Merge remote-tracking branch 'origin/nr-lc-sched' into integration_2022_wk12_a
2022-03-24 11:34:26 +01:00
rmagueta
f0f8acb06a
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-03-21 10:10:21 +00:00
Robert Schmidt
70265d9c64
Refactor fill_default_secondaryCellGroup(): less parameters
2022-03-18 18:54:57 +01:00
Robert Schmidt
e89dfc0243
Refactor RRC: do not duplicate configuration in rrc_gNB_carrier_t
2022-03-18 18:49:09 +01:00
Robert Schmidt
f646b9a57c
Add parameter to disable 256 QAM activation
2022-03-18 18:49:09 +01:00
francescomani
256a00af77
default SIB TDA = 1 (and chech to avoid csi-rs overlapping)
2022-03-18 11:10:21 +01:00
francescomani
85e879b1ea
remove call to csirs configuration in SA (not working yet, asn1 encoding fails)
2022-03-18 10:30:12 +01:00
rmagueta
190eaa1e42
Move CSI-RS configuration from fill_initial_SpCellConfig() to update_cellGroupConfig()
2022-03-17 16:36:50 +00:00
rmagueta
8704f81025
Remove duplicated code
2022-03-17 16:35:06 +00:00
francescomani
8ef72fb939
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-17 07:51:35 +01:00
rmagueta
b59b84e904
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-17 01:03:35 +00:00
rmagueta
2f2bc2a5e8
Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into develop-CSI
...
# Conflicts:
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-16 17:45:39 +00:00
rmagueta
3f88cc1fb1
Intermediate commit: move CSI configuration to a separate function
2022-03-16 17:19:36 +00:00
Robert Schmidt
9714877ee0
Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10
2022-03-07 23:12:49 +01:00
Thomas Schlichter
e7500354c1
harmonize RLC and PDCP configurations in nr_DRB_preconfiguration() and fill_default_secondaryCellGroup()
...
nr_DRB_preconfiguration() is used in phy-test mode by both, OAI UE and gNB, and in all other modes by OAI UE.
Because of inconsistencies, data transfer with OAI UE was only reliably working in phy-test mode.
Ultimately, OAI UE should use nr_DRB_preconfiguration() only in phy-test mode and do proper DRB configuration instead in all other modes!
2022-03-07 16:02:01 +01:00
rmagueta
bbe806a870
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-03-07 13:10:40 +00:00
francescomani
8dfc5d59b4
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-07 09:26:08 +01:00
francescomani
4e76491f79
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-03-07 09:09:17 +01:00
luis_pereira87
b2316f045e
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-07 01:19:20 +00:00
Laurent Thomas
939b249ba8
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into remove-NR_UE_PBCH
2022-03-06 15:53:09 +01:00
Laurent Thomas
aa910f52b6
debug after develop merge
2022-03-06 15:52:42 +01:00
Robert Schmidt
0220f4a6e9
Merge remote-tracking branch 'origin/NR_RRC_256QAM_DL' into integration_2022_wk09_b
2022-03-05 13:33:18 +01:00
rmagueta
a77769d45b
Fix build after merge
2022-03-05 02:32:34 +00:00
rmagueta
a634f14f74
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-05 01:58:51 +00:00
luis_pereira87
bb89ae3aca
Delete duplicated prototype function (update to develop implementation)
2022-03-05 01:42:26 +00:00
francescomani
4fcbdc24a3
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-03-04 17:50:43 +01:00
luis_pereira87
11334aa45f
Delete duplicated prototype function (update to develop implementation)
2022-03-04 14:34:26 +00:00
luis_pereira87
0d92901787
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-03-04 13:09:44 +00:00
Robert Schmidt
bc2246a566
Remove usage of MSC library after last merge
2022-03-04 09:21:02 +01:00
Robert Schmidt
807e5dd71c
Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09
2022-03-03 18:05:27 +01:00
rmagueta
7fdd7547be
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-02 13:14:09 +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
francescomani
e443f75d47
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-01 11:20:14 +01:00