Commit Graph
1193 Commits
Author SHA1 Message Date
Melissa Elkadi 74b2dbe73a Merge branch 'origin-episys-merge-nsa' into eurecom-episys-merge-nsa 2021-10-25 10:34:53 -07:00
Melissa Elkadi b56c8ac3ce Merge remote-tracking branch 'eurecom/develop' into origin-episys-merge-nsa 2021-10-25 10:27:11 -07:00
Melissa Elkadi 7665f397a6 Only calling init_pdcp for NSA mode in gNB executable
Also, reverted some init_pdcp logic to match
the develop branch and added NSA mode. Lastly,
added additional error checking for cellConfig
to avoid crash in MAC layer.
2021-10-19 14:52:41 -07:00
Deokseong "David" Kim a30e27cb11 Adding NSA mode for calling rlc_module_init and SCTP_TASK 2021-10-19 01:36:07 +00:00
Michael Cook 69fc902b52 Set alarm 2021-10-18 22:04:19 +00: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
Deokseong "David" Kim a5d23a0e08 Fixed nr_dlsim and nr_ulsim build errors. 2021-10-13 16:27:13 +00:00
rmagueta d57a4cf513 Remove hardcoded opp_enabled 2021-10-08 13:01:46 +01:00
Melissa 3eafdff63a Syncing our OAI merge branch with our internal NSA master branch 2021-09-30 23:16:46 +00:00
Melissa Elkadi 5ab30707d0 Merge remote-tracking branch 'eurecom/episys-merge-nsa' into origin-episys-merge-nsa 2021-09-29 07:36:01 -07:00
Deokseong "David" Kim a3557eb486 processing crc_ind and rx_ind per pdu in gNB. 2021-09-28 21:57:10 +00:00
Melissa 9b1b629843 Merge branch 'develop' into 'episys-merge-nsa'
# Conflicts:
#   executables/nr-uesoftmodem.c
2021-09-28 20:06:11 +00:00
Laurent Thomas b0b7101641 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into phy-asan-fixes 2021-09-28 16:52:09 +02:00
rmagueta 280249bb2a Merge remote-tracking branch 'origin/bandwidth-testing' into bandwidth-testing-abs
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-09-27 11:05:30 +01:00
rmagueta c0b260673d Merge remote-tracking branch 'origin/develop' into bandwidth-testing-abs 2021-09-27 10:08:14 +01:00
Melissa Elkadi ca0bf39d36 Code clean up part 3.
I have removed more irrelevant comments and
updated a few logs.
2021-09-24 07:44:36 -07:00
Melissa Elkadi 82ba5a3531 Code clean up part one.
This commit includes about 1/3 of the code clean up
in preparation for the merge to the OAI develop
branch. Several of the changes are white space changes,
removing of logs, comment removals, and updating any
changed code for our use-case to be clear for NSA mode.
2021-09-23 12:53:38 -07:00
rmagueta 617bf6a16c Set initial_wait=0 and opp_enabled = 0 2021-09-21 13:00:03 +01:00
rmagueta e5f677aa2b Change LOG levels 2021-09-21 12:13:32 +01:00
Raymond Knopp 2afb70f179 Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing 2021-09-20 23:28:40 +02:00
Raymond Knopp 7ceef76ba5 switchpoint advance for X300 2021-09-20 23:28:13 +02:00
Eurecom 9ec02b2010 pucch0 threshold rule 2021-09-20 10:56:23 +02:00
Raymond Knopp f21211c23d removed logging 2021-09-20 00:24:43 +02:00
Eurecom 9525beb399 N310 testing 2021-09-19 14:46:47 +02:00
Melissa Elkadi d2daf8e860 Change slot_ahead to process ack/nack after pdsch 2021-09-15 11:07:27 -07:00
Sakthivel Velumani 6443cedd6a Updated nfapi PNF to use the thread message buffers 2021-09-15 14:52:24 +05:30
Melissa Elkadi 6a8e4e2883 Merge remote-tracking branch 'eurecom/develop' into episys/mel/merge_develop_cfra_working 2021-09-14 07:34:58 -07:00
Sakthivel Velumani 0de2a333af Merge branch 'develop' into phy-asan-fixes 2021-09-14 16:47:15 +05:30
francescomani beb0c4d8bb implementation of if_freq option at OAI UE 2021-09-13 19:05:32 +02:00
luis_pereira87 5af47448c0 Duplicate parameter removal 2021-09-13 08:55:35 +01:00
luis_pereira87 3a02a7ad4c Update ue-rxgain default value 2021-09-13 08:41:54 +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
Melissa Elkadi d60dfa552a Properly initializing the PDCP layer
Previously, the ue_id passed into the
init_pdcp() in  the proxy would be 41.
This is outside of the bounds of the
nas_sock_fd array and would cause a crash.
This was occuring because the node_number
in the NRUE starts at 2, not 1.
2021-09-03 11:40:53 -07:00
Melissa Elkadi ca1805faaf IP ping traffic is working correctly
In this commit we have updated the NRUE
to properly get the RadioBearer info from
the gNB. Because NSA and SA mode both use
this information, we have updated the SA
function previously in place by changing
the name to allow both NSA and SA mode to
use. This commit also updated the NR/LTE UEs
configuration files to with the correct
proxy IP address.
2021-09-03 10:13:59 -07: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 5836ab1927 Fix build warnings 2021-09-01 14:03:28 +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
David Kim ea63a9eeb0 Merge remote-tracking branch 'origin/episys/mel/merge_develop_cfra_working' into episys/mel/merge_develop_cfra_working_for_multiUE
Resolved merge conflict.
2021-08-31 17:45:26 -07:00
Raymond Knopp cf3b3f889c Merge remote-tracking branch 'origin/bandwidth-testing-abs' into bandwidth-testing 2021-08-31 22:12:24 +02:00
Melissa Elkadi 24d75a99af Only initializing PDCP if using EPC (S1 mode) 2021-08-31 11:48:21 -07:00
rmagueta e621c3533c Change log levels 2021-08-31 18:27:27 +01:00
David Kim 86d605eea1 Fix to handle multiple UEs and typo bug.
1. Changed hard coded preamble index(63) to soft coded.
2. Active UE will not be considered in gNB scheduging RA.
3. Added condition to process dci indication to handle multiple UEs.
4. Bug fix in mutex_lock (unlock to lock). It should be lock rather than unlock.
5. nr_ue_scheduler update not to entering into getting IP traffic to be transmitted in noS1 mode.
6. log update in checking the number of rx_ind or crc
2021-08-30 11:01:32 -07:00
francescomani 6a2352f843 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-30 17:55:38 +02:00
Raymond Knopp 5d760e5cab Merge branch 'bandwidth-testing' of https://gitlab.eurecom.fr/oai/openairinterface5g into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_TRANSPORT/nr_dci.c
	openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
2021-08-30 14:54:54 +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
Melissa Elkadi 63cb61db7d Only do DRB preconfiguration if NOT in noS1 mode 2021-08-25 16:09:20 -07:00
Deokseong "David" Kim 43d8ed216e Update on scheduler to relax AssertFatal. 2021-08-25 22:52:58 +00:00