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
3540920f
Commit
3540920f
authored
Sep 19, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove PDCP/RLC code depending on old F1U/PROTO_AGENT
parent
40518b55
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
41 deletions
+15
-41
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+9
-36
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+6
-5
No files found.
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
3540920f
...
@@ -375,50 +375,23 @@ boolean_t pdcp_data_req(
...
@@ -375,50 +375,23 @@ boolean_t pdcp_data_req(
LOG_F
(
PDCP
,
"
\n
"
);
LOG_F
(
PDCP
,
"
\n
"
);
#ifndef UETARGET
#ifndef UETARGET
static
cudu_params_t
*
cudu
=
NULL
;
if
(
ctxt_pP
->
enb_flag
==
1
)
{
if
(
cudu
==
NULL
)
{
cudu
=
get_cudu_config
();
}
static
int
agent_started
=
1
;
if
(
agent_started
==
1
)
{
for
(
int
k
=
0
;
k
<
cudu
->
serving_dus
;
k
++
)
{
proto_agent_start
(
0
,
cudu
->
cu
[
k
].
cu_id
,
cudu
->
cu
[
k
].
du_type
,
cudu
);
}
agent_started
=
0
;
}
}
if
((
pdcp_pdu_p
!=
NULL
)
&&
(
srb_flagP
==
0
)
&&
(
ctxt_pP
->
enb_flag
==
1
))
if
((
pdcp_pdu_p
!=
NULL
)
&&
(
srb_flagP
==
0
)
&&
(
ctxt_pP
->
enb_flag
==
1
))
{
{
if
(
cudu
->
cu_balancing
==
CU_BALANCING_ALL
)
{
{
for
(
int
j
=
0
;
j
<
cudu
->
serving_dus
;
j
++
)
LOG_E
(
PDCP
,
"proto_agent_send_rlc_data_req()
\n
"
);
{
{
proto_agent_send_rlc_data_req
(
0
,
cudu
->
cu
[
j
].
du_type
,
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
);
//proto_agent_send_rlc_data_req(0,cudu->cu[j].du_type, ctxt_pP, srb_flagP,
}
//MBMS_FLAG_NO,rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p);
rlc_status
=
rlc_data_req
(
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
}
//rlc_status = rlc_data_req(ctxt_pP, srb_flagP, MBMS_FLAG_NO, rb_idP, muiP, confirmP, pdcp_pdu_size, pdcp_pdu_p
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
#if (RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
sourceL2Id
//
,sourceL2Id
,
destinationL2Id
//
,destinationL2Id
#endif
#endif
);
//
);
}
}
else
if
(
cudu
->
cu_balancing
==
CU_BALANCING_ROUND_ROBIN
)
{
int
selected_du
=
select_du
(
cudu
->
serving_dus
);
proto_agent_send_rlc_data_req
(
cudu
->
cu
[
selected_du
].
cu_id
,
cudu
->
cu
[
selected_du
].
du_type
,
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
);
}
else
{
int
index
=
cudu
->
cu_balancing
;
proto_agent_send_rlc_data_req
(
cudu
->
cu
[
index
].
cu_id
,
cudu
->
cu
[
index
].
du_type
,
ctxt_pP
,
srb_flagP
,
MBMS_FLAG_NO
,
rb_idP
,
muiP
,
confirmP
,
pdcp_pdu_size
,
pdcp_pdu_p
);
}
free_mem_block
(
pdcp_pdu_p
,
__FUNCTION__
);
free_mem_block
(
pdcp_pdu_p
,
__FUNCTION__
);
rlc_status
=
ack_result
;
rlc_status
=
ack_result
;
...
...
openair2/LAYER2/RLC/rlc.c
View file @
3540920f
...
@@ -63,17 +63,18 @@ async_server_thread_init (void)
...
@@ -63,17 +63,18 @@ async_server_thread_init (void)
//create log_list
//create log_list
//log_list_init(&log_list);
//log_list_init(&log_list);
AssertFatal
(
0
,
"this should not be reached!
\n
"
);
async_server_shutdown
=
0
;
async_server_shutdown
=
0
;
if
((
pthread_mutex_init
(
&
async_server_lock
,
NULL
)
!=
0
)
if
((
pthread_mutex_init
(
&
async_server_lock
,
NULL
)
!=
0
)
||
(
pthread_cond_init
(
&
async_server_notify
,
NULL
)
!=
0
))
{
||
(
pthread_cond_init
(
&
async_server_notify
,
NULL
)
!=
0
))
{
return
;
return
;
}
}
if
(
pthread_create
(
&
async_server_thread
,
NULL
,
proto_server_init
,
(
void
*
)
NULL
)
//
if (pthread_create (&async_server_thread, NULL, proto_server_init, (void*) NULL)
!=
0
)
{
//
!= 0) {
async_server_thread_finalize
();
//
async_server_thread_finalize();
return
;
//
return;
}
//
}
}
}
...
...
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