rmagueta
b98cf717e5
Fix worker_config
2021-06-02 19:11:04 +01: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
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
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
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
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
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
Raymond Knopp
9be7c35f68
changing config file for SA to connect to AMF
...
also enabling connection to AMF only when --sa option is used.
2021-03-31 11:44:56 +02:00
Raymond Knopp
2913757461
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
executables/nr-softmodem.c
executables/nr-ue.c
openair2/GNB_APP/gnb_app.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-03-31 03:14:48 +02:00
hardy
1214836e75
Merge remote-tracking branch 'origin/nr_power_measurement_fixes' into integration_2021_wk13_c
2021-03-30 16:40:41 +02:00
rmagueta
b55b11b125
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_RA.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2021-03-30 11:51:56 +01:00
Robert Schmidt
576df55450
Merge remote-tracking branch 'origin/fix_NR_DLUL_PF' into integration_2021_wk12
2021-03-30 10:48:57 +02:00
Thomas Schlichter
7848e2575c
add missing pusch_AntennaPorts to conf files
2021-03-30 10:44:15 +02:00
Raymond Knopp
df05672a4c
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
rmagueta
b43c054f02
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# 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-03-29 15:51:37 +01:00
Florian Kaltenberger
5e9248938a
applying new TDA to benetel config file
2021-03-29 10:35:17 +02:00
hardy
ddf3f9e88c
Merge remote-tracking branch 'origin/NR_FAPI_beamindex_SSB_RO' into integration_2021_wk13_a
2021-03-29 10:02:51 +02:00
hardy
a84b1b4340
Merge remote-tracking branch 'origin/fix-quectel' into integration_2021_wk12_b
2021-03-28 21:36:45 +02:00
Raymond Knopp
4d0d4fcb29
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/CMakeLists.txt
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_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
Thomas Schlichter
f9410f7a69
gNB: update ssPBCH_BlockPower to -25 dBm/RE in all USRP conf files
2021-03-25 09:20:08 +01:00
Luis Pereira
e82915c4b1
Revert "Fix msg1-FrequencyStart in config files for SA"
...
This reverts commit b067406097
2021-03-22 15:28:15 +01:00
rmagueta
d37552db4c
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
francescomani
d76c50e34a
Merge remote-tracking branch 'origin/develop' into nr_power_measurement_fixes
2021-03-19 11:22:18 +01:00
Thomas Schlichter
dade64ea43
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-19 11:18:02 +01:00
francescomani
f659a76f43
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-03-19 10:06:20 +01:00
luis_pereira87
b067406097
Fix msg1-FrequencyStart in config files for SA
2021-03-18 18:49:16 +00:00
francescomani
a1f1d53cb5
another tentative fix for gnb initialization crashes
2021-03-18 13:09:36 +01:00
Robert Schmidt
decd654ad0
Change initial{D,U}LBWPlocationAndBandwidth for quectel to connect in testing_gnb.conf files
2021-03-18 09:16:36 +01:00
rmagueta
27f0414e60
Fill pusch_proc_threads in config files
2021-03-16 16:49:30 +00:00