Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
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
zzha zzha
OpenXG-RAN
Commits
457ee6c0
Commit
457ee6c0
authored
Mar 10, 2022
by
Hongzhi Wang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix build issue
parent
bf889968
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
93 deletions
+10
-93
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+4
-90
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlschsim.c
+2
-1
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
+2
-1
openair1/SIMULATION/NR_PHY/ulschsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
+2
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
457ee6c0
...
@@ -187,92 +187,8 @@ else (CUDA_FOUND)
...
@@ -187,92 +187,8 @@ else (CUDA_FOUND)
message
(
"No CUDA tool installed"
)
message
(
"No CUDA tool installed"
)
endif
()
endif
()
INCLUDE
(
FindPackageHandleStandardArgs
)
#INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
dpdk DEFAULT_MSG
)
#FIND_PACKAGE_HANDLE_STANDARD_ARGS(dpdk DEFAULT_MSG)
###########################################
# macros to define options as there is numerous options in oai
################################################
macro
(
add_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
add_definitions
(
"-D
${
name
}
=
${
value
}
"
)
endmacro
(
add_option
)
macro
(
add_boolean_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
set_property
(
CACHE
${
name
}
PROPERTY TYPE BOOL
)
if
(
${
value
}
)
add_definitions
(
"-D
${
name
}
"
)
endif
(
${
value
}
)
endmacro
(
add_boolean_option
)
macro
(
add_integer_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
add_definitions
(
"-D
${
name
}
=
${
value
}
"
)
endmacro
(
add_integer_option
)
macro
(
add_list1_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
set_property
(
CACHE
${
name
}
PROPERTY STRINGS
${
ARGN
}
)
if
(
NOT
"
${
value
}
"
STREQUAL
"False"
)
add_definitions
(
"-D
${
name
}
=
${
value
}
"
)
endif
()
endmacro
(
add_list1_option
)
macro
(
add_list2_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
set_property
(
CACHE
${
name
}
PROPERTY STRINGS
${
ARGN
}
)
if
(
NOT
"
${
value
}
"
STREQUAL
"False"
)
add_definitions
(
"-D
${
value
}
=1"
)
endif
()
endmacro
(
add_list2_option
)
macro
(
add_list_string_option name val helpstr
)
if
(
DEFINED
${
name
}
)
set
(
value
${${
name
}}
)
else
(
DEFINED
${
name
}
)
set
(
value
${
val
}
)
endif
()
set
(
${
name
}
${
value
}
CACHE STRING
"
${
helpstr
}
"
)
set_property
(
CACHE
${
name
}
PROPERTY STRINGS
${
ARGN
}
)
if
(
NOT
"
${
value
}
"
STREQUAL
"False"
)
add_definitions
(
"-D
${
name
}
=
\"
${
value
}
\"
"
)
endif
()
endmacro
(
add_list_string_option
)
# this function should produce the same value as the macro MAKE_VERSION defined in the C code (file types.h)
function
(
make_version VERSION_VALUE
)
math
(
EXPR RESULT
"0"
)
foreach
(
ARG
${
ARGN
}
)
math
(
EXPR RESULT
"
${
RESULT
}
* 16 +
${
ARG
}
"
)
endforeach
()
set
(
${
VERSION_VALUE
}
"
${
RESULT
}
"
PARENT_SCOPE
)
endfunction
()
####################################################
####################################################
# compilation flags
# compilation flags
...
@@ -867,7 +783,7 @@ set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidd
...
@@ -867,7 +783,7 @@ set_target_properties(tcp_bridge_oai PROPERTIES COMPILE_FLAGS "-fvisibility=hidd
######################################################################
######################################################################
#
include_directories ("/usr/include/dpdk")
include_directories
(
"/usr/include/dpdk"
)
set
(
HWLIB_BENETEL_4G_SOURCE
set
(
HWLIB_BENETEL_4G_SOURCE
${
OPENAIR_TARGETS
}
/ARCH/ETHERNET/benetel/4g/benetel.c
${
OPENAIR_TARGETS
}
/ARCH/ETHERNET/benetel/4g/benetel.c
...
@@ -3072,9 +2988,7 @@ add_executable(nr_ulsim
...
@@ -3072,9 +2988,7 @@ add_executable(nr_ulsim
${
SHLIB_LOADER_SOURCES
}
${
SHLIB_LOADER_SOURCES
}
)
)
add_dependencies
(
nr_ulsim ldpc_orig ldpc_optim ldpc_optim8seg ldpc
)
if
(
EXISTS
"/usr/local/lib64/librte_pmd_hpac_sdfec_pmd.so"
)
if
(
EXISTS
"/usr/local/lib64/librte_pmd_hpac_sdfec_pmd1.so"
)
add_dependencies
(
nr_ulsim ldpc_offload
)
add_dependencies
(
nr_ulsim ldpc_offload
)
endif
()
endif
()
...
...
openair1/SIMULATION/NR_PHY/dlschsim.c
View file @
457ee6c0
...
@@ -61,7 +61,8 @@ double cpuf;
...
@@ -61,7 +61,8 @@ double cpuf;
uint16_t
NB_UE_INST
=
1
;
uint16_t
NB_UE_INST
=
1
;
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
const
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
const
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
// needed for some functions
// needed for some functions
PHY_VARS_NR_UE
*
PHY_vars_UE_g
[
1
][
1
]
=
{
{
NULL
}
};
PHY_VARS_NR_UE
*
PHY_vars_UE_g
[
1
][
1
]
=
{
{
NULL
}
};
uint16_t
n_rnti
=
0x1234
;
uint16_t
n_rnti
=
0x1234
;
...
...
openair1/SIMULATION/NR_PHY/pucchsim.c
View file @
457ee6c0
...
@@ -58,7 +58,8 @@ double cpuf;
...
@@ -58,7 +58,8 @@ double cpuf;
//uint8_t nfapi_mode = 0;
//uint8_t nfapi_mode = 0;
uint16_t
NB_UE_INST
=
1
;
uint16_t
NB_UE_INST
=
1
;
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
const
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
const
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
// needed for some functions
// needed for some functions
PHY_VARS_NR_UE
*
PHY_vars_UE_g
[
1
][
1
]
=
{{
NULL
}};
PHY_VARS_NR_UE
*
PHY_vars_UE_g
[
1
][
1
]
=
{{
NULL
}};
...
...
openair1/SIMULATION/NR_PHY/ulschsim.c
View file @
457ee6c0
...
@@ -58,7 +58,8 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
...
@@ -58,7 +58,8 @@ int32_t uplink_frequency_offset[MAX_NUM_CCs][4];
void
init_downlink_harq_status
(
NR_DL_UE_HARQ_t
*
dl_harq
)
{}
void
init_downlink_harq_status
(
NR_DL_UE_HARQ_t
*
dl_harq
)
{}
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
uint8_t
const
nr_rv_round_map
[
4
]
=
{
0
,
2
,
3
,
1
};
const
short
conjugate
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
};
const
short
conjugate2
[
8
]
__attribute__
((
aligned
(
16
)))
=
{
1
,
-
1
,
1
,
-
1
,
1
,
-
1
,
1
,
-
1
};
double
cpuf
;
double
cpuf
;
//uint8_t nfapi_mode = 0;
//uint8_t nfapi_mode = 0;
uint16_t
NB_UE_INST
=
1
;
uint16_t
NB_UE_INST
=
1
;
...
...
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