Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
Melissa Elkadi
9b16c1d860
Merge branch 'eurecom-develop' into episys/merge_nsa_w_develop
...
At this point we are successfully able to build.
Additionally, we can run the scenario,
however, it does not pass. It seems that the gNB
is not connecting to the proxy correctly. Just
wanted to push the progress so far. FYI, the items
that had to be changed to correct the linking issues
were the following:
- mac_rrc_data_ind_ue vs. nr_mac_rrc_data_ind_ue
- rrc_data_req vs. nr_rrc_data_req
- mac_rrc_data_req_ue vs. nr_mac_rrc_data_req_ue
- rrc_data_req_ue vs. rrc_data_req_nr_ue
- rrc_data_req vs. nr_rrc_data_req
The listed functions should be declard in the LTE/NR
UE directory depending on the functionality. Several
were mixed. i.e.: LTE functions being called in NR UE.
Also, removing siWindowLength, siWindowLength_int,
SIBType, SIBPeriod, and siPeriod_int from the NR UE RRC.
These variable were not used in the NR UE and are defined
for LTE only.
Lastly, in the NR_IF_Module.c of the NR UE, the global
variable def_dci_pdu_rel15 is not accessible. Need to
revisit this. For not it is commented out.
2021-08-11 10:23:42 -07:00
Rahul Gottipati
78f3bca19a
CSI-RS handling in nFAPI
2021-08-09 16:36:27 +05:30
Mahesh
557b5445d3
PNF config file pusch_proc_threads update
2021-08-08 12:23:15 +05:30
Melissa Elkadi
97a648e35f
IP Traffic not working, tun if established by NRUE
...
Updated the configuration files. Added a sleep to
ensure that the LTE UE gets attached to the EPC
before the bearer is modified to be gNB. Updated
the ifconfig tunnel up command to be brought up
by the NR UE socket when in NSA mode. Lastly,
started the gNB PDCP layer in S1 mode.
2021-07-28 15:36:11 -07:00
hardy
c93a9497db
Merge remote-tracking branch 'origin/develop-NSA_SA_fixes' into integration_2021_wk30_b
2021-07-24 17:56:38 +02:00
hardy
fad5fbda34
Merge remote-tracking branch 'origin/NR_CSIRS_tomerge' into integration_2021_wk30
2021-07-23 09:18:33 +02:00
luis_pereira87
7c61f6d969
Fix pusch_TargetSNRx10 and pucch_TargetSNRx10 in configuration files
2021-07-22 11:13:14 +01:00
luis_pereira87
ff7cc7ec1b
Add ulsch_max_slots_inactivity to SA config files
2021-07-15 12:59:15 +01:00
luispereira87
8743f58d23
Improve schedule msg3 and fix tda for mixed slots
2021-07-07 18:25:31 +01:00
francescomani
38ad4bbfbc
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-07-01 15:23:28 +02:00
rmagueta
160cb0b930
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_NGAP.c
# openair2/RRC/NR_UE/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
rmagueta
b98cf717e5
Fix worker_config
2021-06-02 19:11:04 +01:00
Melissa Elkadi
2949d3008e
Updating gNB configuration for EMANE
2021-06-01 15:57:41 -07:00
francescomani
a1e3b5476b
Merge remote-tracking branch 'origin/develop' into NR_CSIRS_tomerge
2021-05-27 11:52:12 +02:00
Melissa Elkadi
005c2e0121
Creating seprate proxy config files
2021-05-25 11:57:33 -07:00
luis_pereira87
a7cb146dce
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# ci-scripts/cls_oaicitest.py
2021-05-21 10:41:34 +01:00
Laurent THOMAS
9130197657
add wireshark header files
2021-05-19 10:26:26 +02: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
hardy
a362493cce
Merge remote-tracking branch 'origin/NR_cleanup_PUCCH_resources' into integration_2021_wk20_a
2021-05-16 21:24:38 +02:00
rmagueta
d2ddfa1fbd
Update SA config files
2021-05-06 18:41:26 +01:00
francescomani
638f1b8203
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-05-04 14:11:29 +02:00
Thomas Schlichter
0ac5fcbfad
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-05-04 11:32:07 +02: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
francescomani
ad10ef0dfe
to remove unused PUCCH resources and extend PUSCH tda allocation to 13 symbols
2021-05-03 17:59:08 +02:00
Melissa Elkadi
f434a8ded9
Updating conf files. DL messages from gNB working.
...
NR UE is ending early. LTE is not passing at all.
X2 interface is not working either.
2021-04-30 11:03:30 -07:00
David Kim
2c40332482
showing dl_tti msg
2021-04-29 15:10:33 -07:00
francescomani
e39e2dbafd
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-29 14:46:19 +02:00
Florian Kaltenberger
8d0b9e4cdb
yet some more fixes to the benetel config files
2021-04-27 20:34:00 +02:00
rmagueta
0a3f128e27
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_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_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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/mac_proto.h
# openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
Thomas Schlichter
0da9ec9cfb
Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes
2021-04-27 10:27:31 +02:00
hardy
e2ab8bc54b
Merge remote-tracking branch 'origin/benetel_config_file_fix' into integration_2021_wk17_a
2021-04-26 10:21:05 +02:00
Robert Schmidt
089246c693
Fix Msg.2 TDA to be 1, revert DL TDA configs to two entries
2021-04-25 14:44:46 +02:00
Raghavendra Dinavahi
e658023ff5
Fix for the 16byte alignment issue observed during DMRS modulation.
...
Segmentation fault observed in case the address for mod_dmrs[dmrssymbol] is not 16byte aligned.
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
f3be3daa32
pusch_proc_threads=8 added to configuration files
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
fc1a7f7b8c
Adjusting LocationBandwidth of initial BWP1 in configuration files.
...
LocationandBandwidth adjusted according to the location of SSB and Controlresourceset 0
For example for 106RBs configuration files -
- AbsoluteFrequencySSB = 641032 = RB43 (1032/24) - points to Subcarrier 0 of RB10 of SSB block
- Hence SSB is located from RB33-RB53
- Coresetzero sent in MIB is 0 which means offset 0, RBsize 24 from Start of SSB according to table 13.4 in Spec 38.213
- InitialBWP should start from RB 33 (offset is 0 from SSB) and should be a size of minimum 24 RBs.
- SLIV = 275 * (24-1) + 33 = 6358
Controlresourceset value wrongly configured to 12 , changed to 0 as sent in MIB.
2021-04-23 10:33:56 +02:00
Raghavendra Dinavahi
5934e8e4ee
Changes to Downlink DMRS MASK calculation
...
Procedure fill_dmrs_mask is modified.
- PDSCH Mapping Type B is supported
- Modified according to sections 5.1.6.2 of Spec 38.214
- Single and double symbol DMRS are handled in Type A and Type B
Mapping type according to the time domain allocation from DCI should be used to get the values of DMRS config
For sending sib1 - DCI FORMAT 1_0 will be used with SI_RNTI, UE should perform these actions
according to sections 5.1.6.2 of Spec 38.214
Additional DMRS set to pos2 in case of msg2 reception, msg3 transmission.
Mapping type B is added to RRC reconfig.
- nr_dlsim updated to test typeA and typeB. Verified the changes.
- RFSIM Validation of PDSCH Mapping TypeB by changing timedomainallocation in configuration files.
2021-04-23 10:33:56 +02:00
francescomani
773ebbb63b
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-22 14:36:32 +02:00
Florian Kaltenberger
1b9901953f
reverting some changes in benetel-5g config files that were introduced in anticipation of MR 1079, but which has not been merged yet.
2021-04-21 12:55:01 +02:00
Florian Kaltenberger
13d5ef51ca
OAI EPC
2021-04-20 18:45:22 +02:00
rmagueta
8613aeb9e6
Fixes after merge
...
- No warning in RRC
- Ethernet lib fix: correct include
- fixes Msg.4
- fixes conf: the UE cannot handle mixed slots
2021-04-18 12:42:34 +02:00
Robert Schmidt
c3796c044f
Merge branch 'develop' into integration_2021_wk13_b
2021-04-16 07:23:46 +02:00
Robert Schmidt
7f774d5fbc
Merge branch 'develop' into integration_2021_wk13_b
2021-04-12 17:23:21 +02:00
Raymond Knopp
2473a25ca1
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +02:00
rmagueta
1aab76a48d
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-01 11:19:28 +01:00
francescomani
5498e2b84a
Merge remote-tracking branch 'origin/develop' into NR_scheduling_CSIRS
2021-04-01 09:18:23 +02:00
rmagueta
d86566d366
gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files
2021-03-31 15:52:51 +01:00
rmagueta
1175463c7e
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
2021-03-31 15:33:48 +01:00
rmagueta
53f77219d4
Rework default PDSCH time domain resource allocation tables
2021-03-31 14:31:19 +01:00
hardy
5af77e8fb3
Merge remote-tracking branch 'origin/small_nr_bugfixes' into integration_2021_wk13_d
2021-03-31 13:49:24 +02:00