Raphael Defosseux
c5a2be4c7e
Merge remote-tracking branch 'origin/379-make' into develop_integration_2018_w51
2018-12-18 14:46:29 +01:00
Laurent
aacbd7577c
fix 381
2018-12-13 13:45:59 +01:00
Laurent
89229ac59a
fix issue 379
2018-12-12 14:49:54 +01:00
Clayton Shepard
5832204fe1
Added Iris hardware support.
...
Signed-off-by: Rahman Doost <doost@rice.edu >
2018-12-05 09:47:15 -06:00
Raymond Knopp
6266d5c389
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/mac.h
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_defs.h
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB_S1AP.c
2018-11-19 00:43:49 +01:00
Robert Schmidt
397d2f4815
Merge commit 'develop' into feature-127-protocol-split
...
* remove a lot of white spaces
* many conflicts in enb_config.c
2018-11-07 16:07:59 +01:00
Haruki NAOI
7d9898a5bb
Merge remote-tracking branch 'remotes/origin/develop' into issue_345_l2_fapi_simulator_new
...
# Conflicts:
# openair2/LAYER2/PDCP_v10.1.0/pdcp.c
# openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
# openair2/LAYER2/RLC/rlc.c
2018-11-06 15:03:54 +09:00
Cedric Roux
9b8e4e4cbe
Merge remote-tracking branch 'origin/update-asn1c-0a7524184f16e7093990a31d8d4db487a16e5782' into develop_integration_2018_w44
2018-11-02 10:31:45 +01:00
Cedric Roux
a7cf0cfa1f
Merge remote-tracking branch 'origin/352-support-for-n300' into develop_integration_2018_w44
2018-11-02 10:30:01 +01:00
Raymond Knopp
d24f521a5a
Merge remote-tracking branch 'origin/develop' into enhancement-ltem
...
Conflicts:
openair1/PHY/INIT/lte_init.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci_tools.c
openair1/PHY/LTE_TRANSPORT/dlsch_coding.c
openair1/PHY/LTE_TRANSPORT/edci.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/PHY/LTE_TRANSPORT/print_stats.c
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/transport_eNB.h
openair1/PHY/LTE_TRANSPORT/ulsch_decoding.c
openair1/PHY/LTE_UE_TRANSPORT/transport_proto_ue.h
openair1/PHY/impl_defs_lte.h
openair1/SCHED/fapi_l1.c
openair1/SCHED/phy_procedures_lte_eNb.c
openair2/COMMON/rrc_messages_types.h
openair2/ENB_APP/enb_config.c
openair2/ENB_APP/enb_paramdef.h
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler_RA.c
openair2/LAYER2/MAC/eNB_scheduler_bch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/rar_tools.c
openair2/LAYER2/MAC/ue_procedures.c
openair2/PHY_INTERFACE/IF_Module.c
openair2/RRC/LITE/rrc_common.c
openair2/RRC/LTE/L2_interface_ue.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/rrc_eNB.c
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-ru.c
2018-10-29 07:54:17 +01:00
Bi-Ruei, Chiu
342972c2ea
Update asn1c to commit 0a7524184f16e7093990a31d8d4db487a16e5782
...
Fix the problem that duplicate type names exist in OPEN TYPE.
The following excerpt of ASN.1 of X2AP is one example.
HandoverRequestAcknowledge-IEs X2AP-PROTOCOL-IES ::= {
{ ID id-Old-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
{ ID id-New-eNB-UE-X2AP-ID CRITICALITY ignore TYPE UE-X2AP-ID PRESENCE mandatory}|
...
}
2018-10-25 10:59:13 +08:00
Y_Tomita
6d97a7358b
Add sudo to enable init_nas_S1.
2018-10-23 15:31:13 +09:00
Bi-Ruei, Chiu
d4eb822615
Update asn1c to commit d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
...
1. Fix the problem of compiling NR_RangeToBestCell.c of NR-RRC 15.3.0
2. Fix the problem that default OCTET/BIT STRING value not used in APER
3. Add support of extension group inside CHOICE type used in LTE-RRC 15.3.0
4. Fix the problem that NGAP 15.0.0 ASN.1 can not generate C files
2018-10-17 16:14:57 +08:00
Florian Kaltenberger
7240604115
changing default uhd version when installing from source
...
this is the one that also works with the n310
2018-10-11 06:05:59 -07:00
Bi-Ruei, Chiu
5eceff9ff0
Update asn1c to commit d3aed06bb2bec7df1b5c6d0333f8c7dfc5993372
...
1. Fix the problem of compiling NR_RangeToBestCell.c of NR-RRC 15.3.0
2. Fix the problem that default OCTET/BIT STRING value not used in APER
3. Add support of extension group inside CHOICE type used in LTE-RRC 15.3.0
4. Fix the problem that NGAP 15.0.0 ASN.1 can not generate C files
2018-10-09 09:18:27 +08:00
Raymond Knopp
4cdc01384d
Merge branch 'feature-127-protocol-split' of https://gitlab.eurecom.fr/oai/openairinterface5g into feature-127-protocol-split
...
Conflicts:
cmake_targets/tools/build_helper
2018-09-20 16:25:05 -04:00
Raymond Knopp
05c7681b5a
cu machine @ RH
2018-09-20 16:23:35 -04:00
Raymond Knopp
5a8622960e
partial removal of warning
2018-09-20 16:13:59 -04: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
Bing-Kai Hong
b797dafdc6
1.Update the F1 messages with F1AP spec R15.2.1 and build scripts for proper generation of F1 messages
...
2.Add SCTP procedure (without ITTI) with F1AP
3.Add F1AP test code
2018-08-28 15:05:05 +02:00
Calvin HSU
b58ef54608
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-08-28 12:22:59 +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
Bi-Ruei, Chiu
6562577e96
Update asn1c commit with two new fixes
2018-08-16 16:36:41 +08:00
WEI-TAI CHEN
9b7143ca86
merge develop
2018-08-05 06:19:32 -07:00
Cedric Roux
9e8ad4923b
fix install on centOS
...
- install package 'vim-common' to have 'xxd' needed by the compilation
process of the T tracer
- change the way xxd is called so that no file is created in case
of error
2018-08-01 16:36:35 +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
Cedric Roux
a385af0109
better setup for asn1c
...
- use OAI location to retrieve asn1c
- use a specific commit instead of a branch name
2018-07-24 16:01:54 +02:00
Cedric Roux
1961fd7f20
remove gccxml/castxml
...
This was used for the ITTI analyzer.
The ITTI analyzer is now to be considered obsolete.
The source code will be removed at some point.
2018-07-24 15:52:04 +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
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
Bi-Ruei, Chiu
a3e9c48006
Create configure file for asn1c
...
Add `autoreconf -iv` in build_helper to create configure file for asn1c.
2018-07-13 17:10:27 +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
Elena Lukashova
69d9c0f7c3
Adding lapack-dev and lapacke-dev to build script
2018-07-10 15:05:11 +02:00
Raphael Defosseux
c3d1aac90a
CI: stability / cosmetics improvements
...
-- Stability issues when installing packages for USRP variants on new VM
It sometimes timed-out
Added loop up to 5 tries to add apt-repository
-- Temporary merge during MergeRequest processing now returns an
error when there are any conflicts
Will stop the whole build
-- Physical simulator now has a XLST for the XML result
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2018-06-29 16:43:37 +02:00
Bing-Kai Hong
a21258ece7
Update the F1 messages and build scripts for proper generation of F1 messages
2018-06-26 10:58:46 +02:00
Bing-Kai Hong
05c0ab1a76
Merge remote-tracking branch 'origin/develop' into feature-127-protocol-split
2018-06-15 14:33:25 +02:00
WEI-TAI CHEN
73cfa6bbb6
- Maintain The Configuration Module
...
- Create task for GAB_APP and GAN_RRC
- Create the NR FAPI for P5 interface
- *It could be build, but still have a lot of warning need to maintain
2018-06-14 06:02:26 -07:00
Florian Kaltenberger
9edcd9b961
Merge remote-tracking branch 'origin/develop' into oai_ue_fixes
2018-05-29 01:06:54 -07:00
WEI-TAI CHEN
45519c9249
Merge feature-s1ap-r14-based-on-new-asn1c
2018-05-28 08:17:07 -07:00
WEI-TAI CHEN
33d67f2453
merge S1AP
2018-05-28 05:07:25 -07:00
WEI-TAI CHEN
e9ce528ed7
Modified and fixed common config
2018-05-28 04:52:39 -07:00
Bi-Ruei, Chiu
02aeb1c16d
Build eNB using USRP on Ubuntu 18.04
2018-05-13 10:45:48 +08:00
Nikos Makris
3aabed57d2
Applied patch for aper asn1c - Compile with flag --pdcp-split
2018-04-27 15:24:17 +03:00
Florian Kaltenberger
aca606f90d
making init_nas_s1 script executable
2018-04-17 09:24:34 +02:00
WEI-TAI CHEN
0339b49bdf
RRC .ans1 file and test asn1c
2018-04-13 01:37:04 -07:00
Nikos Makris
da7c24b539
Added definitions for F1AP ASN messages
...
Added asn1c compiler compatible with the F1AP definitions
Compilation fails for the S1AP messages with "error: unknown type name ‘asn_comp_rval_t’"
2018-04-11 20:45:54 +03:00
Florian Kaltenberger
7bc1434733
various small fixes for UE
2018-04-06 17:00:53 +02:00
root
6f290e7125
UE add RF board ZC706+AD9371
...
Conflicts:
cmake_targets/build_oai
openair1/PHY/LTE_TRANSPORT/prach.c
openair1/SCHED/phy_procedures_lte_ue.c
targets/ARCH/COMMON/common_lib.h
targets/RT/USER/lte-softmodem.c
2018-04-06 01:28:22 -07:00
Bi-Ruei, Chiu
7321aab67e
Add S1AP R14 based on new asn1c
...
This feature requires an un-official version of asn1c :
https://github.com/velichkov/asn1c/tree/s1ap
2018-03-28 00:19:01 +08:00
Guy De Souza
2fe84d937c
Build folder change/ NR exec
2018-03-22 11:03:32 +01:00