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
33e351cd
Commit
33e351cd
authored
Sep 12, 2018
by
Wolfgang A. Mozart
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UE compiles now
parent
554af39f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
22 additions
and
6 deletions
+22
-6
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+6
-1
cmake_targets/build_oai
cmake_targets/build_oai
+6
-0
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+2
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+7
-3
openair2/UTIL/MEM/mem_block.h
openair2/UTIL/MEM/mem_block.h
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
33e351cd
...
@@ -675,7 +675,12 @@ add_boolean_option(UE_EXPANSION False "enable UE_EXPANSION w
...
@@ -675,7 +675,12 @@ add_boolean_option(UE_EXPANSION False "enable UE_EXPANSION w
add_boolean_option
(
PHY_TX_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PHY_TX_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PRE_SCD_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
add_boolean_option
(
PRE_SCD_THREAD False
"enable UE_EXPANSION with max 256 UE"
)
########################
#############################################################################
# Flag for UE compilation to avoid issues in common eNB/UE PDCP/RLC functions
#############################################################################
add_boolean_option
(
UETARGET False
"set UE as target for compiler"
)
# Include order
# Include order
##########################
##########################
add_boolean_option
(
ENB_MODE True
"Swap the include directories between openair2 and openair3"
)
add_boolean_option
(
ENB_MODE True
"Swap the include directories between openair2 and openair3"
)
...
...
cmake_targets/build_oai
View file @
33e351cd
...
@@ -69,6 +69,7 @@ DISABLE_LOG_X="False"
...
@@ -69,6 +69,7 @@ DISABLE_LOG_X="False"
USRP_REC_PLAY
=
"False"
USRP_REC_PLAY
=
"False"
BUILD_ECLIPSE
=
0
BUILD_ECLIPSE
=
0
UE_NAS_USE_TUN
=
"False"
UE_NAS_USE_TUN
=
"False"
UETARGET
=
"False"
BASIC_SIMULATOR
=
0
BASIC_SIMULATOR
=
0
trap
handle_ctrl_c INT
trap
handle_ctrl_c INT
...
@@ -226,6 +227,7 @@ function main() {
...
@@ -226,6 +227,7 @@ function main() {
shift
;;
shift
;;
--UE
)
--UE
)
UE
=
1
UE
=
1
UETARGET
=
"True"
echo_info
"Will compile UE"
echo_info
"Will compile UE"
shift
;;
shift
;;
--mu
)
--mu
)
...
@@ -573,6 +575,9 @@ function main() {
...
@@ -573,6 +575,9 @@ function main() {
echo
"set (UE_TIMING_TRACE
$UE_TIMING_TRACE
)"
>>
$cmake_file
echo
"set (UE_TIMING_TRACE
$UE_TIMING_TRACE
)"
>>
$cmake_file
echo
"set (DISABLE_LOG_X
$DISABLE_LOG_X
)"
>>
$cmake_file
echo
"set (DISABLE_LOG_X
$DISABLE_LOG_X
)"
>>
$cmake_file
echo
"set (USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
echo
"set (USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
if
[
"
$UE
"
=
1
]
;
then
echo
"set (UETARGET
$UETARGET
)"
>>
$cmake_file
fi
if
[
"
$UE
"
=
1
-a
"
$NOS1
"
=
"0"
]
;
then
if
[
"
$UE
"
=
1
-a
"
$NOS1
"
=
"0"
]
;
then
echo_info
"Compiling UE S1 build : enabling Linux and NETLINK"
echo_info
"Compiling UE S1 build : enabling Linux and NETLINK"
echo
"set (LINUX True )"
>>
$cmake_file
echo
"set (LINUX True )"
>>
$cmake_file
...
@@ -927,6 +932,7 @@ fi
...
@@ -927,6 +932,7 @@ fi
echo
"set (USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
echo
"set (USRP_REC_PLAY
$USRP_REC_PLAY
)"
>>
$cmake_file
echo
"set (LINUX True )"
>>
$cmake_file
echo
"set (LINUX True )"
>>
$cmake_file
echo
"set (PDCP_USE_NETLINK True )"
>>
$cmake_file
echo
"set (PDCP_USE_NETLINK True )"
>>
$cmake_file
echo
"set (UETARGET True )"
>>
$cmake_file
echo
"set (BASIC_SIMULATOR
\"
True
\"
)"
>>
$cmake_file
echo
"set (BASIC_SIMULATOR
\"
True
\"
)"
>>
$cmake_file
echo
"set (UE_NAS_USE_TUN
\"
True
\"
)"
>>
$cmake_file
echo
"set (UE_NAS_USE_TUN
\"
True
\"
)"
>>
$cmake_file
echo
'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)'
>>
$cmake_file
echo
'include(${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt)'
>>
$cmake_file
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
33e351cd
...
@@ -374,6 +374,7 @@ boolean_t pdcp_data_req(
...
@@ -374,6 +374,7 @@ boolean_t pdcp_data_req(
"[MSG] PDCP DL %s PDU on rb_id %d
\n
"
,(
srb_flagP
)
?
"CONTROL"
:
"DATA"
,
rb_idP
);
"[MSG] PDCP DL %s PDU on rb_id %d
\n
"
,(
srb_flagP
)
?
"CONTROL"
:
"DATA"
,
rb_idP
);
LOG_F
(
PDCP
,
"
\n
"
);
LOG_F
(
PDCP
,
"
\n
"
);
#ifndef UETARGET
static
cudu_params_t
*
cudu
=
NULL
;
static
cudu_params_t
*
cudu
=
NULL
;
if
(
ctxt_pP
->
enb_flag
==
1
)
if
(
ctxt_pP
->
enb_flag
==
1
)
{
{
...
@@ -439,7 +440,7 @@ boolean_t pdcp_data_req(
...
@@ -439,7 +440,7 @@ boolean_t pdcp_data_req(
#endif
#endif
);
);
}
}
#endif
/*UETARGET*/
}
}
switch
(
rlc_status
)
{
switch
(
rlc_status
)
{
...
...
openair2/LAYER2/RLC/rlc.c
View file @
33e351cd
...
@@ -54,6 +54,7 @@ extern boolean_t pdcp_data_ind(
...
@@ -54,6 +54,7 @@ extern boolean_t pdcp_data_ind(
#include "rlc_proto_agent_primitives.h"
#include "rlc_proto_agent_primitives.h"
// PROTO AGENT
// PROTO AGENT
#ifndef UETARGET
void
void
async_server_thread_init
(
void
)
async_server_thread_init
(
void
)
{
{
...
@@ -111,7 +112,7 @@ async_server_thread_finalize (void)
...
@@ -111,7 +112,7 @@ async_server_thread_finalize (void)
return
err
;
return
err
;
}
}
#endif
/*UETARGET*/
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
void
rlc_util_print_hex_octets
(
comp_name_t
componentP
,
unsigned
char
*
dataP
,
const
signed
long
sizeP
)
void
rlc_util_print_hex_octets
(
comp_name_t
componentP
,
unsigned
char
*
dataP
,
const
signed
long
sizeP
)
...
@@ -675,7 +676,7 @@ void rlc_data_ind (
...
@@ -675,7 +676,7 @@ void rlc_data_ind (
if
(
ctxt_pP
->
enb_flag
)
if
(
ctxt_pP
->
enb_flag
)
T
(
T_ENB_RLC_UL
,
T_INT
(
ctxt_pP
->
module_id
),
T_INT
(
ctxt_pP
->
rnti
),
T_INT
(
rb_idP
),
T_INT
(
sdu_sizeP
));
T
(
T_ENB_RLC_UL
,
T_INT
(
ctxt_pP
->
module_id
),
T_INT
(
ctxt_pP
->
rnti
),
T_INT
(
rb_idP
),
T_INT
(
sdu_sizeP
));
#endif
#endif
#ifndef UETARGET
if
((
!
srb_flagP
)
&&
(
ctxt_pP
->
enb_flag
==
1
))
if
((
!
srb_flagP
)
&&
(
ctxt_pP
->
enb_flag
==
1
))
{
{
proto_agent_send_pdcp_data_ind
(
ctxt_pP
,
proto_agent_send_pdcp_data_ind
(
ctxt_pP
,
...
@@ -686,6 +687,7 @@ void rlc_data_ind (
...
@@ -686,6 +687,7 @@ void rlc_data_ind (
sdu_pP
);
sdu_pP
);
}
}
else
else
#endif
/*UETARGET*/
{
{
pdcp_data_ind
(
pdcp_data_ind
(
ctxt_pP
,
ctxt_pP
,
...
@@ -765,6 +767,8 @@ rlc_module_init (void)
...
@@ -765,6 +767,8 @@ rlc_module_init (void)
pool_buffer_init
();
pool_buffer_init
();
#ifndef UETARGET
/* Launch the RLC listening server
/* Launch the RLC listening server
* as a separate thread
* as a separate thread
*/
*/
...
@@ -774,7 +778,7 @@ rlc_module_init (void)
...
@@ -774,7 +778,7 @@ rlc_module_init (void)
async_server_thread_init
();
async_server_thread_init
();
started
=
1
;
started
=
1
;
}
}
#endif
/*UETARGET*/
return
(
0
);
return
(
0
);
}
}
...
...
openair2/UTIL/MEM/mem_block.h
View file @
33e351cd
...
@@ -124,7 +124,7 @@ void check_free_mem_block (mem_block_t * leP);
...
@@ -124,7 +124,7 @@ void check_free_mem_block (mem_block_t * leP);
# define MEM_MNGT_MB12_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*4096
# define MEM_MNGT_MB12_BLOCK_SIZE MEM_MNGT_MB0_BLOCK_SIZE*4096
// 262144
// 262144
# define MEM_MNGT_MB12_NB_BLOCKS
1024
* MEM_SCALE
# define MEM_MNGT_MB12_NB_BLOCKS
32
* MEM_SCALE
//# define MEM_MNGT_MB12_NB_BLOCKS 4096 * MEM_SCALE
//# define MEM_MNGT_MB12_NB_BLOCKS 4096 * MEM_SCALE
# define MEM_MNGT_POOL_ID12 12
# define MEM_MNGT_POOL_ID12 12
...
...
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