maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,688 Commits 5 Branches 0 Tags
2f753873bc9ebdf6c0156f440970cd8748c11e95
Commit Graph
490 Commits
Author SHA1 Message Date
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
francescomani 33663e68b0 rename frame_type 2022-04-19 18:37:14 +02: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
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
Robert Schmidt 054688ade4 Merge remote-tracking branch 'origin/nr_sdap' into integration_2022_wk14 2022-04-06 23:45:07 +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
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
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 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
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
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
francescomani 12f9dd95eb Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-22 09:44:40 +01:00
Raymond Knopp d840ca0dee Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
 2022-03-22 07:03:40 +01:00
luis_pereira87 eb8e4b4999 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
 2022-03-22 05:47:56 +00: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
Robert Schmidt 73bd9034aa Use strtok_r() to split strings in gnb_config.c 2022-03-09 14:39:38 +01:00
francescomani 1dac24844b Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-03-07 09:47:19 +01:00
Raymond Knopp f99754a5ea Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 
Conflicts:
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.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
	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
 2022-03-05 21:12:32 +01:00
francescomani c36c8ccae0 addressing additional review and some wrong allocation 2022-03-02 18:54:35 +01:00
francescomani d4ce30c54d additional review fixes 2022-02-23 16:52:13 +01:00
rmagueta 0e0526e367 Merge remote-tracking branch 'origin/develop' into develop-CSI 
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.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
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2022-02-23 13:51:31 +00:00
francescomani 4c8c11d9db Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-23 13:53:11 +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
rmagueta 6f19524e95 Merge remote-tracking branch 'origin/CSI-SA' into develop-CSI 
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.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
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_nsa.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-02-22 15:10:20 +00:00
francescomani c3d0d6d82a addressing review comments 2022-02-22 14:39:04 +01:00
francescomani 30f6210932 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-21 15:16:39 +01: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 d12eb8efc4 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-02-21 10:38:23 +01:00
Robert Schmidt 21f862641c Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08 2022-02-19 19:34:01 +01:00
Raymond Knopp 6d9d1f0b94 changes for 2.5ms TDD period 2022-02-19 13:07:20 +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
francescomani ec4ae32af0 N1 N2 and XP for DL antenna ports in config file 2022-02-14 19:00:55 +01:00
luis_pereira87 6436f77aa0 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 2022-02-14 10:20:42 +00:00
Raymond Knopp 5ba8b83856 Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control 
Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
	targets/ARCH/AW2SORI/oaiori.c
 2022-02-13 12:24:45 +01:00
Raymond Knopp da54df5bb2 Merge remote-tracking branch 'origin/develop' into harq_latency_control 
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/CODING/crc_byte.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/rrc_gNB.c
 2022-02-13 09:55:01 +01:00
Raymond Knopp 74fd3f029a changes for AW2S NR support in ORI library 2022-02-13 09:44:15 +01:00
Raymond Knopp b9b24588af Merge remote-tracking branch 'origin/develop' into aw2s-n41 
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
 2022-02-11 12:21:29 +01:00
luis_pereira87 9610b7124c Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
 2022-02-09 11:10:31 +00:00
francescomani dd9f285cb7 Merge remote-tracking branch 'origin/develop' into NR_UL_VRB_MAP_improv 2022-02-08 15:37:39 +01:00