Roberto Louro Magueta
2141d6b5af
Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements
...
# Conflicts:
# openair2/RRC/NR/nr_rrc_config.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
2022-06-27 10:24:58 +01:00
francescomani
a037987b47
remove ssb subcarrier offset from config file
2022-05-09 18:28:56 +02:00
Roberto Louro Magueta
fc5632eeb9
Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
...
# Conflicts:
# openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
# openair1/PHY/NR_TRANSPORT/nr_dci.c
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair2/GNB_APP/gnb_config.c
# openair2/GNB_APP/gnb_paramdef.h
# openair2/LAYER2/NR_MAC_gNB/config.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/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
# targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
2022-05-06 13:16:48 +01: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
francescomani
4452308184
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
2022-04-12 09:40:52 +02:00
Raymond Knopp
86b5b9db3d
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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
openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-09 19:44:26 +02: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
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
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
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
Raymond Knopp
9bd16f3c66
- fix for CSI-RS allocation (slot slot 0 in symbol 13, SIB1 10 symbols instead of 12 by default)
...
- extra logging for CRNTI procedure (to catch bug in nr_free_list
2022-03-28 21:45:50 +02: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
francescomani
c36c8ccae0
addressing additional review and some wrong allocation
2022-03-02 18:54:35 +01:00
francescomani
ec4ae32af0
N1 N2 and XP for DL antenna ports in config file
2022-02-14 19:00:55 +01: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
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
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
Laurent THOMAS
792b6b4e0b
merge develop
2021-12-23 22:52:36 +01:00
Laurent THOMAS
0f00e57148
merge develop
2021-12-17 16:29:53 +01:00
Raymond Knopp
99e006f750
testing with UM/No Harq
2021-12-15 13:38:00 +01:00
rmagueta
80853a0f6f
Create do_SRS parameter to enable the periodic SRS
2021-12-09 16:54:16 +00:00
Laurent THOMAS
a38e368be2
fix gtp-u address between NSA and SA modes
2021-11-16 22:03:27 +01:00
francescomani
3311a9ead9
Merge remote-tracking branch 'origin/NR_UE_acknack' into NR_RRC_configuration_functions
2021-11-15 17:58:12 +01:00
francescomani
11ed0f5ede
change name of minRXTXTIME
2021-11-15 17:40:38 +01:00
francescomani
43a831f951
Merge remote-tracking branch 'origin/develop' into NR_UE_acknack
2021-10-20 17:10:24 +02:00
rmagueta
4e949657fb
Fix after merge
2021-10-14 14:59:11 +01:00
rmagueta
b1a8b06547
Merge remote-tracking branch 'origin/integration_2021_wk41' into integration_2021_wk41_bwt-abs
...
# Conflicts:
# ci-scripts/xml_files/fr1_sa_quectel.xml
# openair1/SCHED_NR/fapi_nr_l1.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/GNB_APP/gnb_paramdef.h
2021-10-14 14:22:23 +01:00
Raymond Knopp
b05d165cd0
hand cherry-picked PRB blacklisting
2021-10-11 14:34:49 +02:00
francescomani
e946804bbf
Minimum value of DL to ACK
2021-09-27 18:45:59 +02:00
rmagueta
71cd100335
Merge remote-tracking branch 'origin/nr-pdcp-security-w34' into bandwidth-testing-abs
...
# Conflicts:
# ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-09-08 17:22:28 +01:00
Cedric Roux
eeca38368e
gnb sa: improve security
...
Note: some modifications have been done to the UE too, but for syntactic
reasons. The UE may fail to work, not tested.
For the UE, we have the problem of handling properly SecurityModeCommand.
We don't verify its integrity. This is a bit complicated to handle properly
and may require some API changes in the PDCP layer. So, as of today, the
integrity of this message is not verified.
Also, NSA mode has been touched, but it should not be a problem. But not
tested, so not sure.
2021-09-06 11:06:47 +02:00
Eurecom
33cd8cafbb
after merge with abs
2021-09-01 10:27:13 +02:00
francescomani
e083bd4330
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-13 15:09:52 +02:00
francescomani
d2127b65f3
flexible csi configuration including do_csirs config parameter
2021-07-26 12:45:04 +02:00
francescomani
d6c70f85d2
sib1 tda from config file
2021-05-03 14:30:58 +02:00
rmagueta
45de9e7b25
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
2021-04-24 13:27:11 +01:00
Laurent THOMAS
2784cd484e
revert default values for 5GS
2021-04-21 10:37:55 +02:00
rmagueta
4301582f88
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +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
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
Raymond Knopp
a6b24211ac
configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file.
2021-03-25 14:26:28 +01:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +01:00
Raymond Knopp
4d9ebf0ac0
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
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_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00