Commit Graph
1495 Commits
Author SHA1 Message Date
Melissa Elkadi 6299d4515e Creating UL_ind RACH handle function in VNF
Also fixed a few bugs in nr-nFAPI:
- Push16->push8 fix in packing of RACH
- Allocating memory for pdu_list and preamble_list in unpack
- Properly indexing through both lists during unpack
- Created new nr_rach handling function
2021-06-02 16:33:12 -07:00
Melissa Elkadi f768b90f59 Fixing how we set slot_tx in the NR UE.
Also fixed unpacking ul_tti_inds.
2021-06-02 10:02:03 -07:00
Melissa Elkadi 7a7b668e16 The pRACH is now only generated for slot 19.
Several other changes in this commit include:
- Setting the number of PDUS in the ul_config
  to be zero when we will it (inside of the
  get_ul_config() function.)
- We reset the nprach flag to 0 for each slot.
- We return out of the prach scheduler if
  mac->ul_config == NULL
- Added error checking for array indexing
- Created a dummy scheduler response function.
- Allocated ul_config_req initially
2021-06-01 12:09:15 -07:00
Eurecom d249c1ef80 testing with 2x2 and 4x4 with N310, small modifications in nr_ru_procedures and usrp_lib.cpp for multiple antennas 2021-06-01 09:48:20 +02:00
Roberto Louro Magueta 2e518d95fa Revert "Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into..."
This reverts commit 4100dc3338
2021-05-31 14:13:46 +02:00
Masayuki Harada 4100dc3338 Merge remote-tracking branch 'remotes/oai/develop-NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS 2021-05-31 20:30:21 +09:00
rmagueta a205dcbf44 Fix GTP for LTE 2021-05-31 12:10:24 +01:00
Xue Song 7379717ddf Remove duplicate code
In the UE executable, delete the initialization of NR.nrrrc and check the NULL of NR.nrrrc
2021-05-31 17:36:18 +09:00
Roberto Louro Magueta 1145a5516c Revert "Change hardcoded task id to TASK_VARIABLE"
This reverts commit 64aa42d646
2021-05-31 02:05:38 +02:00
Eurecom ac4670990c handling for UL failure. added do_precoding flag to nr-ru procedures. testing with 2x2 N310. 2021-05-30 23:14:12 +02:00
Mahesh cf0659abe9 Cleanup 2021-05-31 02:13:19 +05:30
rmagueta 64aa42d646 Change hardcoded task id to TASK_VARIABLE 2021-05-30 20:16:55 +01:00
Melissa Elkadi 7db52420bf Created new fill_rach function in the NR UE
Also calling the new L1_nsa_prach_procedures()
function after using the nr_ue_scheduler. Added
some error checking in the nr_ue_scheduler. Added
some error checking in the process_nsa_msg in both
the NR and LTE UE
2021-05-28 15:30:56 -07:00
Melissa Elkadi 4fb87f9d08 Filling rach_ind and sending to proxy
Seems to be working at the moment but
may need to add more info in the rach_ind.
Also, need to verify gNB is getting the
rach_ind and starting RA procedure.
2021-05-27 15:46:00 -07:00
Melissa Elkadi 96be5588b4 Ready to fill rach indication.
Had to hack the code to schedule the prach.
Need to verify this is ok because ul_config = NULL.
Also had to change logic for calling fill_schedule_response.
2021-05-27 12:53:27 -07:00
Melissa Elkadi b32e3f735f This commit breaks in RACH procedure
However, we are not properly calling the
nr_ue_get_rach() function. The RA is being
properly initialized. In the nr_ue_get_rach()
the pRACH is not scheduled. Tried to add in
the scheduling of this, but it crashes here.
The other changes include revering the
nr_ue_get_rach() changes from previous commit.
Also, changed a few log levels and reverted
a previous change in the NR UE RRC layer that
was incorrect.
2021-05-26 14:36:29 -07:00
Sakthivel Velumani 5ec7f39adf fixed PUSCH tx issue 2021-05-26 10:12:58 +02:00
Melissa Elkadi eecd5935ee Not working pRACH but starting it 2021-05-25 15:56:08 -07:00
Melissa Elkadi b2b8d297a0 Memory bug fixes
Several places where memory ownership was changed
and the original owner was not set to NULL. Also,
the transaction_identifier is now based on the
received dl_dcch_msg in the LTE UE. Still need to
fix the t_id for the NR UE. Also added comments for
RACH procedure in NR UE.
2021-05-24 18:55:42 -07:00
Mahesh 99a6001643 Resolved merge conflicts and allocated gNB struct in VNF 2021-05-25 04:37:23 +05:30
Sakthivel Velumani 30c2746b9b call ul_indication again for PUCCH 2021-05-24 20:07:43 +02:00
Raymond Knopp 1c4fef02dd Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation
Conflicts:
	cmake_targets/autotests/test_case_list.xml
	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
	targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
2021-05-22 16:33:44 +02:00
francescomani f84d6767c3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-05-20 16:13:46 +02:00
Laurent THOMAS 449bab30c7 fix nr UE bug: random freeze (mutex not init) 2021-05-20 14:20:00 +02:00
rmagueta 997b198bb1 Fix issues after merge 2021-05-19 12:28:40 +01:00
rmagueta 8c5725ed46 Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair2/SIMULATION/NR_RRC/itti_sim.c
2021-05-19 12:09:27 +01:00
Laurent THOMAS d42e44ec28 revert thread configuration specific to test 2021-05-19 12:02:29 +02:00
Laurent THOMAS 9130197657 add wireshark header files 2021-05-19 10:26:26 +02:00
Laurent THOMAS 16d9d33d04 Fix minor bugs and wrong reported trace 2021-05-19 09:58:48 +02:00
francescomani cd9a8f963f moving pucch functions for harq at MAC (version still to be tested) 2021-05-18 11:04:10 +02:00
rmagueta fd3a45de82 Fix build issues 2021-05-17 12:01:32 +01:00
rmagueta cf605f4c77 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/COMMON/platform_constants.h
#	openair2/ENB_APP/enb_config.c
#	openair2/F1AP/f1ap_cu_interface_management.c
#	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
#	openair2/F1AP/f1ap_cu_ue_context_management.c
#	openair2/F1AP/f1ap_du_interface_management.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.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_primitives.c
#	openair2/RRC/LTE/rrc_eNB.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
Laurent THOMAS b5bbfdade3 after merge, remain compile errors 2021-05-16 23:57:35 +02:00
luis_pereira87 a6069f7481 Fix dl_carrier assignment 2021-05-13 16:30:21 +01:00
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
Mahesh 7d59106c5f nfapi working with latest threading architecture 2021-05-11 02:26:59 +05:30
Raymond Knopp 83ccc50f18 Merge remote-tracking branch 'origin/develop' into oairu 2021-05-10 00:39:55 +02:00
matzakos 31d73a7bf2 Remove artificial triggering of RRC Setup Request from nrUE 2021-05-07 15:06:52 +02:00
matzakos 0ea7946da8 Remove redundant call to init_pdcp for noS1 2021-05-07 15:05:05 +02:00
Roberto Louro Magueta 0816940fb5 Revert "Revert "Call the right function for the initiation of gtp-u task at gNB""
This reverts commit 278bfa8d6a
2021-05-05 15:13:52 +02:00
Sakthivel Velumani 2a6442096c Merge remote-tracking branch 'origin/develop' into prb_based_dl_channel_estimation 2021-05-05 14:34:14 +02:00
rmagueta 102a76fd56 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/NR_PHY_INTERFACE/NR_IF_Module.c
2021-05-04 11:23:21 +01:00
Melissa Elkadi 7e339b4610 Currently receiving measurement data from NR UE
This commit has several other changes. The changes
include the following:
1. Changed the port numbers for the NRUE<->Proxy
2. Fixed the send to function in the NR UE
   (Previously only sending buffer not buffer+msg_type)
3. Updated pack/unpack of the SSB PDU (new RSRB field added)
4. Fixed several NR logs
5. Opening socket with NRUE<->Proxy AFTER receving RRC
   measurement request from the LTE UE
2021-05-03 15:31:32 -07:00
rmagueta 948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2021-05-03 19:50:30 +01:00
hardy c2acb9e9e5 Merge remote-tracking branch 'origin/NR_FR2_initsync_fixes' into integration_2021_wk18_a 2021-05-03 15:45:39 +02:00
Eurecom 35236c818f Merge branch 'NR_SA_F1AP_5GRECORDS' into gnb-n300-fixes
Conflicts:
	executables/nr-ru.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-05-02 10:04:37 +02:00
Melissa Elkadi 34eeae0874 NR SA thread and sockets have been added.
This commit also removed MAX_NUM_NEIGH_CELLs and
replaced it with MAX_GNB_CELLS. This was a minor change
OAI added. The standalone sockets for the NR UE correctly
connect to the proxy. We are currently receiving dl_tti
messages from the proxy.
2021-05-01 15:05:04 -07:00
Melissa Elkadi 6cace48013 Added in init function in RRC_NSA_NRUE task creation 2021-05-01 12:47:16 -07:00
Melissa Elkadi 539b1b564a Removed commented code in nr-softmodem.c
Also enabled X2 when we are not using the EPC
Added in the case statement for handling the
dl_dcch_msg from the NR UE. Also added in the
proper decoding of that dl_dcch_msg and freeing
2021-05-01 11:48:21 -07:00
Melissa Elkadi e50ca02957 Chaging NR functions to be properly named
This commit removed all the linking errors
between the NR UE and the LTE UE. This was done by
changing:
-      rrc_data_req_ue
+      rrc_data_req_nr_ue
2021-05-01 11:32:26 -07:00