francescomani
9fb094600f
cosmetic changes and duplicate code
2021-09-13 14:54:49 +02:00
rmagueta
eb99d98ccf
Fix issues after merge
2021-09-10 10:42:02 +01:00
rmagueta
452e2eb812
Fix ulsch_max_slots_inactivity
2021-09-09 09:37:13 +01: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
rmagueta
204bffbc7a
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# executables/nr-uesoftmodem.c
# executables/nr-uesoftmodem.h
# executables/softmodem-common.h
# openair2/LAYER2/NR_MAC_UE/mac_proto.h
# 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_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-09-08 16:31:24 +01:00
francescomani
17c0268775
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-09-07 17:17:35 +02:00
Laurent Thomas
7b2f3440e9
merge develop
2021-09-07 16:51:30 +02:00
Cedric Roux
4877d56a12
nr: add security section to gnb config files
...
The configuration files named "gnb*conf" have been modified.
Other configuration files were left unmodified.
2021-09-06 11:06:47 +02:00
Raphael Defosseux
592d99b5bc
fix(enb): start_background_system was not called in noS1 mode
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-09-03 10:27:33 +02:00
hardy
12b1cb8fde
Merge remote-tracking branch 'origin/NR_UE_SA' into integration_2021_wk35
2021-09-02 23:11:40 +02:00
David Kim
6342e67c33
Setting UE and nrUE IP address in config file.
...
1. Removed hard coded IP address in the code for UE and nrUE's remote address.
2. Read IP address from config file for UE and nrUE's remote address.
2021-09-02 13:33:42 -07:00
rmagueta
5e1065e88f
Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs
...
# Conflicts:
# executables/nr-uesoftmodem.c
# executables/nr-uesoftmodem.h
# executables/softmodem-common.h
# openair1/PHY/MODULATION/slot_fep_nr.c
# openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
# openair1/SCHED_NR/fapi_nr_l1.c
# openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
# openair2/LAYER2/NR_MAC_UE/mac_proto.h
# openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.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_ulsch.c
2021-09-02 17:57:48 +01:00
rmagueta
7be39f7120
Change choffset to use channel RF A in B210
2021-09-01 18:28:31 +01:00
Laurent THOMAS
d360113cfa
comment out end_configmodule meanwhile someone verify all parameters that should have PARAMFLAG_NOFREE
2021-09-01 11:29:32 +02:00
Eurecom
33cd8cafbb
after merge with abs
2021-09-01 10:27:13 +02:00
rmagueta
e621c3533c
Change log levels
2021-08-31 18:27:27 +01:00
rmagueta
7928ed42bf
Change choffset to use channel RF A in B210
2021-08-31 17:45:30 +01:00
Laurent THOMAS
0f033d99ff
merge develop
2021-08-31 13:29:28 +02:00
francescomani
6a2352f843
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-30 17:55:38 +02:00
francescomani
b10d32d8b8
Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS
2021-08-27 16:02:58 +02:00
Eurecom
1b028d7d89
limitation to 1 DL slot/TDD period for testing
2021-08-27 08:04:03 +02:00
hardy
b798755347
Merge remote-tracking branch 'origin/prb_based_dl_channel_estimation' into integration_2021_wk34
2021-08-26 14:33:33 +02:00
matzakos
ca8b7c915c
Merge remote-tracking branch 'origin/develop' into NR_F1C_F1U_extensions
2021-08-25 17:06:17 +02:00
francescomani
b6ef23a395
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-25 15:01:40 +02:00
francescomani
a1595c3109
setting ulsch inactivity timer from slots to frames and removing it from config files (default 10 frames)
2021-08-24 18:02:54 +02:00
Eurecom
bafd82a935
Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing
...
Conflicts:
executables/nr-ru.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair2/LAYER2/NR_MAC_gNB/config.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_primitives.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_reconfig.c
2021-08-21 07:48:04 +02:00
Eurecom
f41890b3f5
testing in SA, initialBWP
2021-08-20 14:17:37 +02:00
Melissa Elkadi
0ee8f20d54
Updated gNB conf file & last RRC msg in LTE/NR UE
2021-08-19 13:53:12 -07:00
Sakthivel Velumani
38d1782f9b
minor fixes (review comments)
2021-08-19 13:40:12 +05:30
francescomani
834af3d5c6
Merge remote-tracking branch 'origin/fix-513-duplicate-complex-structure' into integration_2021_w33
2021-08-19 08:33:00 +02:00
Laurent THOMAS
c310d246bb
merge develop
2021-08-18 11:20:39 +02:00
Sakthivel Velumani
7f5009d7cc
fixed SA issues
2021-08-17 17:59:41 +05:30
Eurecom
dc92538744
DCI formats 1_1/0_1 on initialBWP
2021-08-17 13:44:50 +02:00
Sakthivel Velumani
cdbdba5631
fixed merge
2021-08-17 16:10:40 +05:30
Sakthivel Velumani
a87dca8691
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-16 18:59:29 +05:30
Melissa Elkadi
2a979f4e2f
Merge branch 'eurecom-nfapi-nr-arch-mod' into episys/merge_nsa_w_develop
2021-08-13 10:27:30 -07:00
francescomani
e083bd4330
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-08-13 15:09:52 +02:00
Rahul Gottipati
540d2e2977
Rebase to latest develop
2021-08-12 15:20:16 +05:30
Laurent THOMAS
89eb5850cf
merge develop, no big issue, we are sync
2021-08-12 10:08:25 +02: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
Raphael Defosseux
5f9e0a235d
Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32
2021-08-09 10:07:45 +02:00
Rodolphe BERTOLINI
387223eea6
removed duplicate structure, changed 'x' to 'r' and 'y' to 'i'
2021-08-09 09:59:38 +02:00
Mahesh
557b5445d3
PNF config file pusch_proc_threads update
2021-08-08 12:23:15 +05:30
magounaki
4ba8ef3a60
n310 config file
2021-08-06 20:23:10 +05:30
francescomani
2daa9144c4
Merge remote-tracking branch 'origin/NR_SA_tempfix_coreset' into NR_UE_SA
2021-08-06 09:26:17 +02:00
Melissa Elkadi
745241bd63
Merge branch 'episys/nsa_epc_gnb_updates' into episys/david/multiUE_with_crnti_checking
...
Also, lots of debugging logs added
2021-08-04 16:24:27 -07:00
Laurent THOMAS
7fcd5e3e29
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_F1C_F1U_extensions
2021-08-04 13:49:43 +02:00
Eurecom
969a7a08fe
Merge remote-tracking branch 'origin/develop' into bandwidth-testing
...
Conflicts:
openair2/GNB_APP/MACRLC_nr_paramdef.h
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-08-04 12:09:42 +02:00
Sakthivel Velumani
6050776f55
Merge branch 'develop' into prb_based_dl_channel_estimation
2021-08-02 12:17:03 +02:00