Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Michael Black
OpenXG UE
Commits
6409970e
Commit
6409970e
authored
Mar 22, 2018
by
Guy De Souza
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Build folder change/ NR exec
parent
876af41f
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
213 additions
and
49 deletions
+213
-49
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+89
-3
cmake_targets/build_oai
cmake_targets/build_oai
+21
-36
cmake_targets/lte_noS1_build_oai/CMakeLists.template
cmake_targets/lte_noS1_build_oai/CMakeLists.template
+0
-9
cmake_targets/tools/build_helper
cmake_targets/tools/build_helper
+1
-1
openair1/PHY/INIT/defs_NR.h
openair1/PHY/INIT/defs_NR.h
+27
-0
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+25
-0
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+24
-0
targets/RT/USER/nr-softmodem.c
targets/RT/USER/nr-softmodem.c
+22
-0
targets/RT/USER/nr-softmodem.h
targets/RT/USER/nr-softmodem.h
+4
-0
No files found.
cmake_targets/CMakeLists.txt
View file @
6409970e
...
...
@@ -1232,6 +1232,53 @@ set(PHY_SRC_UE
${
OPENAIR1_DIR
}
/PHY/TOOLS/lut.c
)
set
(
PHY_NR_SRC
# depend on code generation from asn1c
${
RRC_FULL_DIR
}
/asn1_constants.h
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if4_tools.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if5_tools.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/ofdm_mod.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep.c
${
OPENAIR1_DIR
}
/PHY/INIT/nr_parms.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/lte_dfts.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/log2_approx.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_sv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cdot_prod.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/signal_energy.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/dB_routines.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/sqrt.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/time_meas.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/lut.c
)
set
(
PHY_NR_UE_SRC
# depend on code generation from asn1c
${
RRC_FULL_DIR
}
/asn1_constants.h
# actual source
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if4_tools.c
${
OPENAIR1_DIR
}
/PHY/LTE_TRANSPORT/if5_tools.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/ofdm_mod.c
${
OPENAIR1_DIR
}
/PHY/MODULATION/slot_fep.c
${
OPENAIR1_DIR
}
/PHY/INIT/nr_parms.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/file_output.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cadd_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/lte_dfts.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/log2_approx.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_sv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cmult_vv.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/cdot_prod.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/signal_energy.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/dB_routines.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/sqrt.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/time_meas.c
${
OPENAIR1_DIR
}
/PHY/TOOLS/lut.c
)
if
(
${
SMBV
}
)
set
(
PHY_SRC
"
${
PHY_SRC
}
${
OPENAIR1_DIR
}
/PHY/TOOLS/smbv.c"
)
endif
(
${
SMBV
}
)
...
...
@@ -1242,6 +1289,8 @@ endif ()
add_library
(
PHY
${
PHY_SRC
}
)
add_library
(
PHY_UE
${
PHY_SRC_UE
}
)
add_library
(
PHY_NR
${
PHY_NR_SRC
}
)
add_library
(
PHY_NR_UE
${
PHY_NR_UE_SRC
}
)
#Layer 2 library
#####################
...
...
@@ -1940,7 +1989,7 @@ add_definitions(-DASN1_MINIMUM_VERSION=924)
# add executables for operation
#################################
# lte-softmodem is
both eNB and UE
implementation
# lte-softmodem is
eNB
implementation
###################################################
add_executable
(
lte-softmodem
...
...
@@ -1980,7 +2029,7 @@ target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CR
target_link_libraries
(
lte-softmodem
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-softmodem
${
T_LIB
}
)
# lte-softmodem-nos1 is
both eNB and UE
implementation
# lte-softmodem-nos1 is
eNB
implementation
###################################################
add_executable
(
lte-softmodem-nos1
${
rrc_h
}
...
...
@@ -2053,7 +2102,7 @@ target_link_libraries (lte-uesoftmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${
target_link_libraries
(
lte-uesoftmodem
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem
${
T_LIB
}
)
# lte-softmodem-nos1 is
both eNB and
UE implementation
# lte-softmodem-nos1 is UE implementation
###################################################
add_executable
(
lte-uesoftmodem-nos1
${
rrc_h
}
...
...
@@ -2087,6 +2136,43 @@ target_link_libraries (lte-uesoftmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt cry
target_link_libraries
(
lte-uesoftmodem-nos1
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
lte-uesoftmodem-nos1
${
T_LIB
}
)
# nr-softmodem
###################################################
add_executable
(
nr-softmodem
#${rrc_h}
#${s1ap_h}
${
OPENAIR_BIN_DIR
}
/messages_xml.h
${
OPENAIR_TARGETS
}
/RT/USER/rt_wrapper.c
${
OPENAIR_TARGETS
}
/RT/USER/lte-ru.c
${
OPENAIR1_DIR
}
/SIMULATION/TOOLS/taus.c
${
OPENAIR_TARGETS
}
/COMMON/create_tasks.c
${
OPENAIR_TARGETS
}
/ARCH/COMMON/common_lib.c
${
OPENAIR1_DIR
}
/SIMULATION/ETH_TRANSPORT/netlink_init.c
#${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
${
OPENAIR_DIR
}
/common/utils/utils.c
${
OPENAIR_DIR
}
/common/utils/system.c
${
GTPU_need_ITTI
}
${
XFORMS_SOURCE
}
${
XFORMS_SOURCE_SOFTMODEM
}
${
T_SOURCE
}
${
CONFIG_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
target_link_libraries
(
nr-softmodem
-Wl,--start-group
UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_NR LFDS GTPV1U SECU_CN SECU_OSA
${
ITTI_LIB
}
${
FLPT_MSG_LIB
}
${
ASYNC_IF_LIB
}
${
FLEXRAN_AGENT_LIB
}
LFDS7
${
MSC_LIB
}
${
RAL_LIB
}
${
NAS_UE_LIB
}
#RRC_LIB S1AP_LIB S1AP_ENB L2
#NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
-Wl,--end-group z dl
)
target_link_libraries
(
nr-softmodem
${
LIBXML2_LIBRARIES
}
)
target_link_libraries
(
nr-softmodem pthread m
${
CONFIG_LIBRARIES
}
rt crypt
${
CRYPTO_LIBRARIES
}
${
OPENSSL_LIBRARIES
}
${
NETTLE_LIBRARIES
}
sctp
${
XFORMS_LIBRARIES
}
${
PROTOBUF_LIB
}
${
CMAKE_DL_LIBS
}
${
LIBYAML_LIBRARIES
}
)
target_link_libraries
(
nr-softmodem
${
LIB_LMS_LIBRARIES
}
)
target_link_libraries
(
nr-softmodem
${
T_LIB
}
)
# USIM process
#################
#add_executable(usim
...
...
cmake_targets/build_oai
View file @
6409970e
...
...
@@ -506,44 +506,29 @@ function main() {
echo_info
"3. building the compilation directives ..."
DIR
=
$OPENAIR_DIR
/cmake_targets
if
[
"
$NR
"
=
"True"
]
then
if
[
"
$NOS1
"
=
"1"
]
;
then
build_dir
=
nr_noS1_build_oai
build_dir
=
noS1_build_ran
if
[
"
$gNB
"
=
"1"
]
;
then
exec
=
nr-softmodem-nos1
fi
if
[
"
$nrUE
"
=
"1"
]
;
then
elif
[
"
$nrUE
"
=
"1"
]
;
then
exec
=
nr-uesoftmodem-nos1
elif
[
"
$eNB
"
=
"1"
]
;
then
exec
=
lte-softmodem-nos1
elif
[
"
$UE
"
=
"1"
]
;
then
exec
=
lte-uesoftmodem-nos1
fi
else
build_dir
=
nr_build_oai
build_dir
=
build_ran
if
[
"
$gNB
"
=
"1"
]
;
then
exec
=
nr-softmodem
fi
if
[
"
$nrUE
"
=
"1"
]
;
then
elif
[
"
$nrUE
"
=
"1"
]
;
then
exec
=
nr-uesoftmodem
fi
fi
else
if
[
"
$NOS1
"
=
"1"
]
;
then
build_dir
=
lte_noS1_build_oai
if
[
"
$eNB
"
=
"1"
]
;
then
exec
=
lte-softmodem-nos1
fi
if
[
"
$UE
"
=
"1"
]
;
then
exec
=
lte-uesoftmodem-nos1
fi
else
build_dir
=
lte_build_oai
if
[
"
$eNB
"
=
"1"
]
;
then
elif
[
"
$eNB
"
=
"1"
]
;
then
exec
=
lte-softmodem
fi
if
[
"
$UE
"
=
"1"
]
;
then
elif
[
"
$UE
"
=
"1"
]
;
then
exec
=
lte-uesoftmodem
fi
fi
fi
# configuration module libraries, one currently available, using libconfig
config_libconfig_shlib
=
params_libconfig
...
...
cmake_targets/lte_noS1_build_oai/CMakeLists.template
deleted
100644 → 0
View file @
876af41f
set(ENABLE_ITTI True)
set(ENABLE_USE_MME False)
set(PDCP_USE_NETLINK True)
set(LINK_ENB_PDCP_TO_IP_DRIVER True)
set(LINK_ENB_PDCP_TO_GTPV1U False)
set(PDCP_USE_NETLINK_QUEUES False)
set(LINUX True)
set(SECU False)
set(NAS_UE False)
cmake_targets/tools/build_helper
View file @
6409970e
...
...
@@ -147,7 +147,7 @@ clean_all_files() {
set_openair_env
dir=$OPENAIR_DIR/cmake_targets
rm -rf $dir/log $OPENAIR_DIR/targets/bin/*
rm -rf $dir/
lte_
build_oai $dir/lte-simulators/build
rm -rf $dir/build_oai $dir/lte-simulators/build
rm -rf $dir/oaisim_build_oai/build $dir/oaisim_build_oai/CMakeLists.txt
rm -rf $dir/autotests/bin $dir/autotests/log $dir/autotests/*/build
}
...
...
openair1/PHY/INIT/defs_NR.h
0 → 100644
View file @
6409970e
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
#ifndef __INIT_DEFS_NR__H__
#define __INIT_DEFS_NR__H__
#include "PHY/defs.h"
#endif
openair1/PHY/INIT/nr_init.c
0 → 100644
View file @
6409970e
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
#include "defs.h"
#include "defs_NR.h"
#include "assertions.h"
#include <math.h>
openair1/PHY/INIT/nr_parms.c
0 → 100644
View file @
6409970e
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
#include "defs.h"
#include "defs_NR.h"
#include "log.h"
targets/RT/USER/nr-softmodem.c
0 → 100644
View file @
6409970e
/*
* Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The OpenAirInterface Software Alliance licenses this file to You under
* the OAI Public License, Version 1.1 (the "License"); you may not use this file
* except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.openairinterface.org/?page_id=698
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*-------------------------------------------------------------------------------
* For more information about the OpenAirInterface (OAI) Software Alliance:
* contact@openairinterface.org
*/
#include "nr-softmodem.h"
targets/RT/USER/nr-softmodem.h
0 → 100644
View file @
6409970e
#ifndef LTE_SOFTMODEM_H
#define LTE_SOFTMODEM_H
#endif
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment