Roberto Louro Magueta
8ac68929bc
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/defs_nr_common.h
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-05-17 19:13:38 +01:00
Roberto Louro Magueta
87e79e5eb8
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/config.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/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
# targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.band78.tm1.106PRB.usrpn300.gtp-itti.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
# targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2022-05-06 11:32:36 +01:00
luis_pereira87
a8e6bf9bd5
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair2/GNB_APP/gnb_config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/RRC/NR/L2_nr_interface.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_defs.h
# openair2/RRC/NR/nr_rrc_proto.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-05-06 11:29:55 +01:00
Sakthivel Velumani
454dc0cfab
Fixed memory leaks identified by address san
...
There is still a leak that needs to be fixed in rrc_UE.c
Should properly free NR_BCCH_BCH_Message_t *bcch_message after asn decoder using ASN_STRUCT_FREE()
2022-04-28 18:53:42 +05:30
luis_pereira87
940abc3587
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
2022-04-11 13:49:40 +01:00
rmagueta
8c056ceefc
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-04-08 18:19:06 +01:00
luis_pereira87
a87e99ad69
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair1/PHY/TOOLS/lte_ue_scope.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-08 14:21:00 +00:00
Melissa Elkadi
79cc21f6f5
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-07 06:33:51 -08:00
rmagueta
a634f14f74
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-05 01:58:51 +00:00
Robert Schmidt
807e5dd71c
Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09
2022-03-03 18:05:27 +01:00
rmagueta
7fdd7547be
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-02 13:14:09 +00:00
Melissa Elkadi
bf153a2306
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-01 07:23:54 -08:00
Melissa Elkadi
2b1cc455b0
Merge branch 'episys-ul-info-cleanup' into episys/master-sa
2022-02-24 15:48:43 -08:00
Laurent THOMAS
22d2e9a38f
fix warnings and race cond in polar codec
2022-02-23 18:02:55 +01:00
rmagueta
4d17364142
Fix build warnings
2022-02-23 14:16:58 +00:00
rmagueta
0e0526e367
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.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/RRC/NR/rrc_gNB_nsa.c
2022-02-23 13:51:31 +00:00
luis_pereira87
8238c40ce9
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# 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_primitives.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-02-23 10:48:49 +00:00
rmagueta
bb82697819
Fix segmentation fault at UE in nr_schedule_csi_for_im and nr_schedule_csirs_reception
2022-02-22 19:14:17 +00:00
Robert Schmidt
72a4ed80da
Merge remote-tracking branch 'origin/msc-removal' into integration_2022_wk08
2022-02-19 19:43:11 +01:00
luis_pereira87
405edc8bd3
Fix RRC state and sub-state
2022-02-16 12:43:04 +00:00
Melissa
8c2a067a22
Merge branch 'episys/david/checking_downlink_siso_model' into 'episys/master-nsa'
...
Downlink SISO modeling
See merge request aburger/openairinterface5g!104
2022-02-08 14:51:55 -08:00
Masayuki Harada
db303c3beb
Merge remote-tracking branch 'remotes/oai/develop' into NR_SA_pdu_session_modify_release
2022-02-01 15:44:34 +09:00
Robert Schmidt
00e058537d
Remove MSC library, it is not used anywhere
2022-01-27 10:53:07 +01:00
Cedric Roux
fe4c988c97
nr ue: fix security setting of DRB
...
Maybe this fix won't work for non-openair gNB. We use the same keys and
algorithms as for SRBs, which is what openair gNB does.
(I hope I'm right there.)
To be changed if needed.
2022-01-24 15:56:45 +01:00
francescomani
42bf576596
review fixes
2022-01-10 14:09:21 +01:00
francescomani
7b490f330c
Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities
2022-01-10 10:11:55 +01:00
francescomani
3606c38145
uecap file from command line at gnb for phytest and dora mode
2022-01-07 14:48:09 +01:00
francescomani
a54c1f239e
passing the file name on top of the path for uecap
2022-01-04 14:11:21 +01:00
francescomani
0d3ee346bf
uecap file path from command line at UE
2021-12-30 12:17:11 +01:00
Robert Schmidt
6c823168fe
Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d
2021-12-24 10:13:27 +01:00
francescomani
25bd60a96a
fixes in case of no uecap file found
2021-12-23 18:02:30 +01:00
francescomani
fcfcc6050b
fix in ue capability size
2021-12-20 09:13:01 +01:00
francescomani
9f87b9dd15
bugfix, thanks to Cedric
2021-12-17 12:03:44 +01:00
francescomani
f3bf2cf2e7
Merge remote-tracking branch 'origin/develop' into NR_UE_Capabilities
2021-12-16 17:23:55 +01:00
Michael Cook
589033f4b4
Change some LOG_I's to LOG_A's
...
Our proxy_testscript.py expects these specific log messages to be
logged as LOG_A
2021-11-26 09:16:38 -08:00
Melissa Elkadi
94d146e80b
Renaming queue.h in PHY_INTERFACE layer to queue_t.h
...
There are two queue.h files in this repository.
2021-11-23 08:05:58 -08:00
Melissa Elkadi
6f69e836a8
This commit allows IP traffic to work for 2 UEs in NSA mode
...
The nr_rrc_ue_process_RadioBearerConfig() function
call in the RRC layer of the NRUE was removed when
it should not have been for NSA mode. This is now
added back in for NSA mode. Also, the call to
pdcp_run should only be when were NOT in NOS1 mode
and ARE in SA mode. This was fixed as well.
Ue-to-Ue IP traffic in NSA works, but eventually
the NSA UE will crash due to an incorrect PDCCH
configuration. This is a bug we will need to look
into. It doesnt always crash, only about 40% of
the time. And even when the NRUE does crash, it
happens towards the end of the simulation.
2021-11-18 11:45:47 -08:00
Masayuki Harada
aba84b06cb
Merge remote-tracking branch 'remotes/oai/develop' into NR_SA_pdu_session_modify_release
2021-11-18 09:27:37 +09:00
Laurent THOMAS
66073d50fc
merge develop
2021-11-15 10:25:52 +01:00
Melissa Elkadi
046258f1ba
Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa
2021-11-09 15:17:58 -08:00
David Kim
e5ac73a552
Merge remote-tracking branch 'origin/episys/mel/sa_development_init' into episys/david/nsa_ci_debug_for_sa
2021-11-08 21:21:44 -08:00
Melissa Elkadi
fa4617c0bf
Fixing MR based on OAI feedback
...
The following was changed in this commit:
- A new struct in the mac instance was created
for all emulated L1 fields.
- NR UE RRC state bug was fixed
- Checking the RAR rnti based on the MAC instance
ra.ra_rnti and not hardcoding to 0x10b
- Modified the name of the new emulate_l2 flag
to make sense: emulate_l1
2021-11-08 10:59:28 -08:00
hardy
4c2c7f92a5
Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b
2021-11-08 13:12:52 +01:00
Melissa Elkadi
f4448023df
Merge branch 'episys/master-nsa' into episys/mel/sa_development_init
2021-11-04 11:48:34 -07:00
Melissa Elkadi
10dec919ce
Temp fix to try to get CBRA procdeure complete
...
Need to review this with Raymond.
2021-11-04 11:11:13 -07:00
David Kim
4fb67cbd9c
Resolved conflict in Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa
2021-11-04 10:24:48 -07:00
David Kim
f4049a9fe2
Code cleanup
2021-11-04 09:31:42 -07:00
Laurent THOMAS
9d1fe78e2e
merge develop, no working yet
2021-11-04 12:53:01 +01:00
David Kim
c7f083b14a
Updated gNB part to handle CI test
2021-11-03 22:30:28 -07:00
Melissa Elkadi
b8444ecbc1
Merge branch 'eurecom-develop' into episys/mel/sa_development_init
2021-11-03 08:54:06 -07:00