Florian Kaltenberger
f755654918
Merge branch 'develop-nr' into nr_pdcch
2018-10-24 02:06:20 -07:00
Bi-Ruei, Chiu
c7aa94c3fa
Upgrade ASN.1 of NR-RRC to 15.3.0
2018-10-17 19:17:20 +08:00
Bi-Ruei, Chiu
99e8dea6d4
Upgrade ASN.1 of LTE-RRC to 15.3.0
2018-10-17 19:17:20 +08:00
Hongzhi
a8f94e7a84
Bug fixes
2018-10-11 17:43:41 +02:00
yilmazt
97c65436f6
Merge branch 'nr_pdcch' into develop-nr
2018-10-11 15:37:50 +02:00
Florian Kaltenberger
cc002b823f
Merge branch 'develop-nr-merge' into develop-nr
...
lte-softmodem, lte-uesoftmodem, nr-softmodem, nr-uesoftmodem, polartest, ldpctest, ulsim, dlsim all compile
functionality and performance to be tested by CI
2018-08-30 07:08:26 -07:00
WEI-TAI CHEN
c9eb16cc60
Merge branch 'nr-rrc-additions' of https://gitlab.eurecom.fr/oai/openairinterface5g into nr-rrc-additions
2018-08-29 04:31:20 -07:00
WEI-TAI CHEN
7475a22e1e
EN-DC in gNB
2018-08-29 04:29:58 -07:00
WEI-TAI CHEN
a14450d2ac
fix segmentation fault
2018-08-28 04:23:27 -07:00
Raymond Knopp
3367cc9319
lte-softmodem compiles
2018-08-27 13:37:00 +02:00
Raymond Knopp
bf407e6c34
rrc_eNB_S1AP.c compiles
...
L2_interface.c doesn't
2018-08-26 00:32:53 +02:00
Raymond Knopp
51c0c42207
rrc_eNB.c compiles
...
rrc_eNB_S1AP.c doesn't
2018-08-26 00:06:40 +02:00
Raymond Knopp
efeb48e09e
rrc_UE.c merged
...
rrc_eNB.c doesn't compile
2018-08-25 23:27:16 +02:00
Raymond Knopp
019149e565
intermediate step (rrc_UE.c doesn't compile)
2018-08-25 22:23:51 +02:00
Raymond Knopp
b93b7073ca
Merge remote-tracking branch 'origin/develop' into develop-nr
...
Conflicts:
ci-scripts/Jenkinsfile-gitlab
ci-scripts/buildOnVM.sh
ci-scripts/checkCodingFormattingRules.sh
ci-scripts/createVM.sh
ci-scripts/destroyAllRunningVM.sh
ci-scripts/reportBuildLocally.sh
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
cmake_targets/tools/build_helper
common/utils/LOG/log.h
openair1/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
openair1/PHY/TOOLS/file_output.c
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/tools_defs.h
openair1/PHY/defs_eNB.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair2/COMMON/platform_constants.h
openair2/COMMON/platform_types.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/main.c
openair2/RRC/LTE/L2_interface.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg_NB_IoT.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
openair2/UTIL/LOG/log.c
openair3/S1AP/s1ap_common.h
openair3/S1AP/s1ap_eNB.c
openair3/S1AP/s1ap_eNB_context_management_procedures.c
openair3/S1AP/s1ap_eNB_decoder.c
openair3/S1AP/s1ap_eNB_decoder.h
openair3/S1AP/s1ap_eNB_handlers.c
openair3/S1AP/s1ap_eNB_nas_procedures.c
openair3/S1AP/s1ap_eNB_overload.c
openair3/S1AP/s1ap_eNB_trace.c
openair3/TEST/EPC_TEST/play_scenario_decode.c
openair3/TEST/EPC_TEST/play_scenario_s1ap.c
openair3/TEST/EPC_TEST/play_scenario_s1ap_compare_ie.c
targets/COMMON/openairinterface5g_limits.h
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.usrpb210.conf
targets/RT/USER/lte-ran.c
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ue.c
targets/SIMU/USER/oaisim_functions.c
2018-08-25 18:20:44 +02:00
Hongzhi
11c1256f5e
Merge branch 'develop-nr' into nr_pdcch
...
Conflicts:
cmake_targets/CMakeLists.txt
2018-08-23 10:03:12 +02:00
Guy De Souza
cf7c7937da
merge with develop-nr
2018-08-20 10:07:35 +02:00
WEI-TAI CHEN
616a66b7dd
Replace "#ifdef Rel14" by "#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))"
...
We can build Rel15 for LTE now
2018-08-09 06:08:33 -07:00
WEI-TAI CHEN
ef77d53de2
Done for do_RLC_BEARER, do_MAC_CELLGROUP, do_PHYSICALCELLGROUP function like do_MIB_NR and do_SERVINGCELLCONFIGCOMMON
2018-08-09 04:42:49 -07:00
WEI-TAI CHEN
272fa05fea
new function in order to fill CellGroupConfig
2018-08-08 16:19:43 -07:00
WEI-TAI CHEN
b9037d1566
Complete merge develop into nr-rrc-additions
...
First build command : ./build_oai --gNB -w USRP -I
2018-08-07 05:31:52 -07:00
WEI-TAI CHEN
3e354e2ece
merge develop but not complete [unstable]
2018-08-06 01:46:19 -07:00
WEI-TAI CHEN
9b7143ca86
merge develop
2018-08-05 06:19:32 -07:00
WEI-TAI CHEN
a6c95ca2da
Define new structure for fill cellgroupconfig
2018-08-04 07:00:31 -07:00
WEI-TAI CHEN
09c00b291b
merge develop-nr
2018-08-03 03:33:28 -07:00
WEI-TAI CHEN
037e37eab4
do_SERVINGCELLCONFIGCOMMON will be reuse for fill common config
2018-08-03 03:29:17 -07:00
WEI-TAI CHEN
02a602fad3
Update the 38331-f21 version
2018-08-02 09:17:00 -07:00
WEI-TAI CHEN
307b763b8d
-Uppdate RRC ASN1 Version to 38331-f21
...
But NR-RRC-Definitions.asn file only include the NR-RRC-Definitions DEFINITIONS section
If we include the NR-UE-Variables into asn file, it will can't be compile in asn tool
and also some of implict problem for new version asn file
2018-08-02 06:39:55 -07:00
Calvin HSU
df7acb2af7
silence asn1c warnings. UE: update rx_ind and fix type0-pdcch
2018-08-01 11:31:46 +02:00
frtabu
6c23bdec60
fix compilation errors in ETHERNET or noS1 mode
2018-07-31 00:42:53 +02:00
frtabu
30509955c2
remove compilation warnings, especially when disabling T_TRACER. enhance LOG_M macro implementation, introduce LOG_DEBUG_XXX macro to replace #ifdef DEBUG_XXX
2018-07-30 20:07:22 +02:00
frtabu
b85cbddeec
log.c simplification, fix usefull functionality which never worked, move all log code from openair2 to common
2018-07-30 20:07:22 +02:00
WEI-TAI CHEN
2ed120d266
Since there are some error can't compile for 38311-f21.asn Version, NR RRC ASN go back to 38331-f10 version
2018-07-28 15:08:47 -07:00
yilmazt
c7bb34aace
changes for dci/does not compile
2018-07-26 13:56:04 +02:00
Calvin HSU
bf6744686e
UE: Add DL_CONFIG_REQ for PDCCH(DCI) and DLSCH config
...
clean code
2018-07-24 10:31:45 +02:00
hongzhi wang
e1554c6f89
UE: Add P5 phy_config_request with MIB information.
...
MIB PDU decode complete.
2018-07-20 16:46:42 +02:00
Cedric Roux
b1d0287327
Merge remote-tracking branch 'origin/issue321_tdd_config1' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
2018-07-20 12:26:13 +02:00
Cedric Roux
d89dbb4882
Merge remote-tracking branch 'origin/feature-s1ap-r14-based-on-new-asn1c' into develop_integration_2018_w29
...
Conflicts:
targets/SIMU/PROC/channel_sim_proc.c
targets/SIMU/USER/oaisim_pad.c
2018-07-20 12:10:15 +02:00
Cedric Roux
c836ef28f4
Merge remote-tracking branch 'origin/enhancement-rfsim' into develop_integration_2018_w29
...
Conflicts:
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/UTIL/LOG/log.c
targets/RT/USER/lte-uesoftmodem.c
targets/SIMU/USER/oaisim.c
targets/SIMU/USER/oaisim_functions.c
2018-07-20 12:06:26 +02:00
WEI-TAI CHEN
66e4dc7169
LTE eNB RRC update to Rel15
2018-07-20 01:55:57 -07:00
Calvin HSU
33bd476c85
UE: Fixed mac/ue_procedures
2018-07-19 18:27:50 +02:00
hongzhi wang
3a5f22d99d
UE: add MAC and RRC instance initialization
2018-07-19 17:37:36 +02:00
WEI-TAI CHEN
9b1c03d10e
-Update LTE RRC ASN to Rel15, but there is a parameter that does not meet the specifications since I modify asn file.
...
-I modify the name of the parameter "maxRS-IndexCellQual-r15" to "maxRS-IndexCellQualNR-r15" in structure,
otherwise it will be conflict with the Macro define "#define maxRS_IndexCellQual_r15 (16)" in asn1_constant.h
2018-07-19 07:17:01 -07:00
WEI-TAI CHEN
a487b71bd7
Update RRC .asn to f21
2018-07-18 01:22:35 -07:00
Calvin HSU
c7b297cf68
UE: modify pdcch config common, config_ue.c to compatiable RRC setup/release mechanism
...
deleted files not use
2018-07-16 17:16:29 +02:00
Calvin HSU
3e32b94f02
UE: add IF module initialization in nr-ue.c
...
update author contact information
2018-07-16 15:35:23 +02:00
WEI-TAI CHEN
754c92d4e2
signature
2018-07-13 02:02:08 -07:00
Haruki NAOI
b033317286
Merge remote-tracking branch 'remotes/origin/develop' into issue321_tdd_config1
...
# Conflicts:
# openair2/UTIL/LOG/log.c
2018-07-13 14:13:10 +09:00
Bi-Ruei, Chiu
0071fb6173
Add ASN files of LTE-RRC, S1AP and X2AP of 2018 Jun release
2018-07-13 10:04:46 +08:00
Bi-Ruei, Chiu
a247907d3a
Use an un-official community collaboration version of asn1c
...
1. It's no need to modify LTE-RRC's ASN.1 file for enabling option group
feature in generate_asn1.
2. It's no need to patch the C header files generated from
LTE-RRC/S1AP/X2AP's ASN.1 in fix_asn1.
3. It's no need to pre-process S1AP/X2AP's ASN.1 for enabling information
object class feature by asn1tostruct.py.
This commit requires an un-official version of asn1c which are
collaboration of asn1c community members and `build_helper` is modified
in this commit accordingly :
https://github.com/brchiu/asn1c/tree/velichkov_s1ap_plus_option_group
This asn1c can also convert ASN.1 of 5G NR RRC (38.331, v15.1.0) and
generate C files with -findirect-choice command line option without
tweaking ASN.1 file.
Examples for how to use this asn1c for S1AP are in S1AP files, e.g.
s1ap_eNB_nas_procedures.c and s1ap_eNB_handler.c.
There is an modified openair-cn (based on tag 0.5.0) with this new asn1c at :
https://github.com/brchiu/openair-cn/tree/new-asn1c
Basic S1AP interaction and data transfer operation between OAI eNB and
this modified openair-cn has been tested.
Note: Community version of asn1c is keeping evolved to provide better usage.
2018-07-13 10:04:46 +08:00