hardy
b5ffe11bd8
Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
...
Conflicts:
openair1/PHY/TOOLS/nr_phy_scope.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02:00
hardy
c4745c3e46
Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/TOOLS/time_meas.h
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy
246afc7ccb
Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15
2021-04-14 14:37:09 +02:00
Laurent THOMAS
86f1c69f26
Fix code review remarks, merge develop, revert some merge errors
2021-04-13 22:28:02 +02:00
Raymond Knopp
1e60fbd49f
Merge branch 'NR_SA_F1AP_5GRECORDS' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
2021-04-12 10:21:25 +02:00
Laurent Thomas
307098da4a
merge develop
2021-04-09 12:39:33 +02:00
Raymond Knopp
0b59ce4faf
Merge remote-tracking branch 'origin/develop' into oairu
2021-04-07 15:50:46 +02:00
Laurent Thomas
873e42612a
merge develop, documentation fix
2021-04-06 21:32:19 +02:00
francescomani
73a42a67ca
Merge remote-tracking branch 'origin/develop' into NR_UE_SA
2021-04-06 11:34:18 +02:00
Laurent OpenCells
4511e70fac
fix from ci results
2021-04-05 12:56:52 +02:00
Laurent OpenCells
c0ef3e6f88
fix gcc reported issues
2021-04-03 23:37:58 +02: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
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
Laurent THOMAS
738728142f
merge develop
2021-03-29 15:33:45 +02:00
Laurent THOMAS
68a81f65b2
merge develop
2021-03-29 11:24:34 +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
Laurent THOMAS
fbf39eecc1
cppcheck fixes
2021-03-26 16:32:20 +01:00
frtabu
1a93c759c8
fix cppcheck error
2021-03-26 12:14:32 +01:00
Raymond Knopp
4840b895dd
adding PRACH signal to T tracer
2021-03-24 16:09:48 +01:00
francescomani
62b68e788c
init frame parms ue sa
2021-03-23 15:47:46 +01:00
Laurent THOMAS
3bd3f452c2
:( remove sanitize=address option, fix some cppchecks
2021-03-21 23:48:46 +01:00
Melissa Elkadi
4dad535ef9
Reverted white space changes
2021-03-19 09:58:44 -07:00
Melissa Elkadi
6b0a173007
Updated configuration files
2021-03-19 09:53:30 -07:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +01:00
Raymond Knopp
94085a41cd
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-16 08:07:16 +01:00
David Kim
2948a2445e
Merge branch 'episys/master' into episys/david/episys-merge-2nd-x2c
2021-03-15 11:05:35 -07:00
Laurent THOMAS
d659ceb849
merge develop
...
Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels
2021-03-15 09:44:33 +01:00
Michael Cook
092caec8ca
Merge branch 'episys-merge' into episys/trial-merge-to-master
2021-03-14 10:58:46 -04:00
David Kim
94c9866b7e
adding nfapi_nr_develop_new changes
2021-03-13 13:09:34 -08:00
He Shanyun
8965dd782b
Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-11 14:39:36 +09:00
frtabu
1f0e82664f
enhance channel model configuration
2021-03-10 02:33:31 +01:00
Remi Hardy
51c55f6f6a
Merge remote-tracking branch 'origin/gnb-threadpool' into integration_2021_wk10
2021-03-09 16:13:09 +01:00
Remi Hardy
1142acf0fe
Merge remote-tracking branch 'origin/t-gnb-tracer' into integration_2021_wk10
2021-03-09 16:12:52 +01:00
Thomas Schlichter
2cf4daefa8
NR: move nr_bandtable from nr_mac_common.c to nr_common.c so PHY can use it, too
2021-03-09 11:56:06 +01:00
Raymond Knopp
d72b9c4e71
Merge remote-tracking branch 'origin/develop' into oairu
2021-03-08 13:41:14 +01:00
Laurent THOMAS
6c7dc65981
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into gnb-threadpool
2021-03-04 12:05:01 +01:00
Melissa Elkadi
e3168a7d8c
Merge remote-tracking branch 'eurecom/develop' into eurecom-episys-merge
2021-03-03 16:12:04 -08:00
Melissa Elkadi
9fe1167f29
Remove cppcheck-suppressions that were prev added
...
These cppcheck errors are occuring in code
that is untouched by this merge request.
2021-03-02 13:10:09 -08:00
Cedric Roux
95b659ab44
T tracer: add gnb tracer
...
Minimalist gnb tracer to trace (for the moment) rxdataF when some
decoding for PUCCH or PUSCH has been done.
Important: T_BUFFER_MAX and T_CACHE_SIZE have been changed. T_BUFFER_MAX
is twice as big as before. T_CACHE_SIZE has been devided by two. Globally,
the memory usage of the T tracer is the same, but since we divided by two
the number of buffers in the cache, we may hit some realtime problems if
all the buffers are busy at some point. The simple solution would be to
use 8192*2 for T_CACHE_SIZE as it was, but then we double the memory usage
of the T tracer. This, or another solution, to be defined.
2021-03-02 10:08:00 +01:00
Melissa Elkadi
15905c746d
Fixing cppcheck issues
2021-03-01 15:13:50 -08:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01:00
Sakthivel Velumani
0e2ecd7bce
Merge branch 'develop' into gnb-threadpool
2021-02-25 13:48:13 +01:00
Raymond Knopp
11c3a26414
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2021-02-24 21:52:14 +01:00
Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08:00
laurent
c910668e7b
add LOG_M() binary format
2021-02-19 10:48:35 +01:00
Sakthivel Velumani
f62095fb32
Updated nr_dlsim to generate matlab files
...
Updated matlab file write function to write multiple vectors to a single file.
2021-02-16 10:29:38 +01:00
Xue Song
5918c03cd4
add nrue nas task
2021-02-16 14:14:46 +09:00
Melissa Elkadi
ecaa20ed14
Re-do fix for merge issues
2021-02-15 15:08:46 -08:00
Melissa Elkadi
26e3f32b69
Fixed fill_ul_mutex
...
Mutexes were not being initialized. In multiple
places they were not being unlocked. In fill rach
it was not being locked or unlocked.
2021-02-15 12:40:32 -08:00