maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,174 Commits 5 Branches 0 Tags
894c45eae5020ddc970fa596e24499d7c5c71a9b
Commit Graph
647 Commits
Author SHA1 Message Date
Robert Schmidt 12c0f52fea Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 2022-06-08 19:45:17 +02:00
Cedric Roux f71766c3ee Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 
Conflicts:
	openair2/F1AP/f1ap_du_ue_context_management.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp

There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.

To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
 2022-06-08 15:48:24 +02:00
Raymond Knopp 83d40a9b7c Add missing parameter preambleTransMax_CE_rel13 
To SIB2 and its passing to RRC. Parameter was read but not transfered
before. Basic LTE-M functionality should ok on develop branch with this
fix. Tested with uBlox SARA-R4 (QCOM chipset)
 2022-05-30 16:19:35 +02:00
rmagueta d01cd03ad3 Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-30 16:40:58 +01:00
francescomani 33663e68b0 rename frame_type 2022-04-19 18:37:14 +02:00
luis_pereira87 940abc3587 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 2022-04-11 13:49:40 +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
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
athanassopoulos a826af5839 SDAP Initial Implementation 2022-04-01 13:35:40 +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
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
rmagueta 11577f6b0b Fix DU to CU RRC message encode 2022-03-25 01:01:29 +00:00
Robert Schmidt f646b9a57c Add parameter to disable 256 QAM activation 2022-03-18 18:49:09 +01:00
Raymond Knopp 6abb1e362d Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC 
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SIMULATION/NR_PHY/dlschsim.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_uci.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
 2022-03-09 19:16:23 +01:00
luis_pereira87 a87e99ad69 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair1/PHY/TOOLS/lte_ue_scope.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-03-08 14:21:00 +00:00
francescomani 8dfc5d59b4 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-07 09:26:08 +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
francescomani 4c8c11d9db Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-02-23 13:53:11 +01:00
luis_pereira87 8238c40ce9 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	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
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-02-23 10:48:49 +00:00
Robert Schmidt 21f862641c Merge remote-tracking branch 'origin/cleanup-20220125' into integration_2022_wk08 2022-02-19 19:34:01 +01:00
luis_pereira87 47592d53aa 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
 2022-02-16 11:17:24 +00:00
francescomani ec4ae32af0 N1 N2 and XP for DL antenna ports in config file 2022-02-14 19:00:55 +01:00
Masayuki Harada db303c3beb Merge remote-tracking branch 'remotes/oai/develop' into NR_SA_pdu_session_modify_release 2022-02-01 15:44:34 +09:00
Laurent THOMAS 3e7c22e7c6 gtp-u old code delete 2022-01-26 11:27:02 +01:00
rmagueta ef021c23e0 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
 2022-01-17 15:46:27 +00:00
matzakos e5899e2f74 Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop 2022-01-17 13:19:45 +01:00
luis_pereira87 c9b8bf475b Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
#	openair1/PHY/TOOLS/lte_enb_scope.c
 2022-01-17 10:21:22 +00:00
Laurent THOMAS 3f2dd17191 code review comments + re-test 2022-01-13 16:04:16 +01:00
luis_pereira87 c1f6dbfb2f Fix Msg4 for mac subheader long, RB calculation improvement, and fix variable types to support bigger payload lengths 2022-01-13 11:16:11 +00:00
rmagueta cf8f6fdeed Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/RRC/NR/L2_nr_interface.c
 2022-01-08 12:11:56 +00:00
Laurent THOMAS 2d105be71e fix CU assert and bugs discovered after 2021-12-28 11:29:26 +01:00
rmagueta 97962f4635 Merge remote-tracking branch 'origin/develop' into develop-SRS 
# Conflicts:
#	common/utils/nr/nr_common.h
#	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
 2021-12-24 11:53:25 +00:00
Robert Schmidt 6c823168fe Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d 2021-12-24 10:13:27 +01:00
Laurent THOMAS 792b6b4e0b merge develop 2021-12-23 22:52:36 +01:00
rmagueta 80853a0f6f Create do_SRS parameter to enable the periodic SRS 2021-12-09 16:54:16 +00:00
Melissa Elkadi 4f9c2bd869 Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-29 14:33:23 -08:00
francescomani 9a863691a2 Merge remote-tracking branch 'origin/develop' into NR_RRC_configuration_functions 2021-11-29 09:47:27 +01:00
Laurent THOMAS 1d0abb9077 merge develop, fix a existing memory overlap 2021-11-25 15:53:04 +01:00
hardy dc4d243b6c Merge remote-tracking branch 'origin/develop-aw2sori' into integration_2021_wk47_b 2021-11-24 09:42:56 +01:00
Masayuki Harada aba84b06cb Merge remote-tracking branch 'remotes/oai/develop' into NR_SA_pdu_session_modify_release 2021-11-18 09:27:37 +09:00
francescomani 11ed0f5ede change name of minRXTXTIME 2021-11-15 17:40:38 +01:00
Laurent THOMAS 66073d50fc merge develop 2021-11-15 10:25:52 +01:00
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop 
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	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_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	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
 2021-11-14 21:18:50 +01:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
matzakos c8f76a2469 Increase size of RRC container carrying cellGroupConfig info for F1 initial UL RRC message transfer 
-Fixing issue with decoding cellGroupConfig later
 2021-11-12 15:29:44 +01:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
hardy 88fd5df1f0 Merge remote-tracking branch 'origin/nr_multiple_ue' into integration_2021_wk45_b 2021-11-08 13:13:56 +01:00
Laurent THOMAS 9d1fe78e2e merge develop, no working yet 2021-11-04 12:53:01 +01:00
Mario Joa-Ng b64f9f379f fix bug in GNB MAC nr_store_dlsch_buffer() to handle multipe UEs correctly. 2021-11-03 11:34:47 -04:00
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00