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
46583d77
Commit
46583d77
authored
Jan 31, 2017
by
Xenofon Foukas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stability improvements for remote real-time control
parent
a5366e50
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
15 deletions
+18
-15
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+12
-9
openair2/ENB_APP/MESSAGES/V2/stats_common.proto
openair2/ENB_APP/MESSAGES/V2/stats_common.proto
+1
-0
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+5
-6
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
46583d77
...
...
@@ -657,6 +657,8 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
full_ul_report
->
pucch_dbm
[
j
]
->
p0_pucch_dbm
=
flexran_get_p0_pucch_dbm
(
enb_id
,
i
,
j
);
full_ul_report
->
pucch_dbm
[
j
]
->
has_p0_pucch_dbm
=
1
;
}
full_ul_report
->
pucch_dbm
[
j
]
->
has_p0_pucch_updated
=
1
;
full_ul_report
->
pucch_dbm
[
j
]
->
p0_pucch_updated
=
flexran_get_p0_pucch_status
(
enb_id
,
i
,
j
);
}
//Add full UL CQI report to the UE report
...
...
@@ -943,15 +945,14 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
subframe
=
(
sub_frame_t
)
flexran_get_current_subframe
(
mod_id
);
subframe
=
((
subframe
+
ahead_of_time
)
%
10
);
int
full_frames_ahead
=
((
ahead_of_time
/
10
)
%
10
);
frame
=
frame
+
full_frames_ahead
;
if
(
subframe
<
flexran_get_current_subframe
(
mod_id
))
{
frame
++
;
frame
=
(
frame
+
1
)
%
1024
;
}
int
additional_frames
=
ahead_of_time
/
10
;
frame
=
(
frame
+
additional_frames
)
%
1024
;
sf_trigger_msg
->
header
=
header
;
sf_trigger_msg
->
has_sfn_sf
=
1
;
sf_trigger_msg
->
sfn_sf
=
flexran_get_future_sfn_sf
(
mod_id
,
1
);
...
...
@@ -976,8 +977,8 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
dl_info
[
i
]
->
rnti
=
flexran_get_ue_crnti
(
mod_id
,
i
);
dl_info
[
i
]
->
has_rnti
=
1
;
/*Fill in the right id of this round's HARQ process for this UE*/
u
nsigned
char
harq_id
;
u
nsigned
char
harq_status
;
u
int8_t
harq_id
;
u
int8_t
harq_status
;
flexran_get_harq
(
mod_id
,
UE_PCCID
(
mod_id
,
i
),
i
,
frame
,
subframe
,
&
harq_id
,
&
harq_status
);
dl_info
[
i
]
->
harq_process_id
=
harq_id
;
dl_info
[
i
]
->
has_harq_process_id
=
1
;
...
...
@@ -985,11 +986,13 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
dl_info
[
i
]
->
n_harq_status
=
2
;
dl_info
[
i
]
->
harq_status
=
malloc
(
sizeof
(
uint32_t
)
*
dl_info
[
i
]
->
n_harq_status
);
for
(
j
=
0
;
j
<
dl_info
[
i
]
->
n_harq_status
;
j
++
)
{
dl_info
[
i
]
->
harq_status
[
j
]
=
harq_status
;
// TODO: This should be different per TB
if
(
harq_status
==
0
)
if
(
harq_status
==
0
)
{
dl_info
[
i
]
->
harq_status
[
j
]
=
PROTOCOL__FLEX_HARQ_STATUS__FLHS_ACK
;
else
if
(
harq_status
>
0
)
}
else
{
dl_info
[
i
]
->
harq_status
[
j
]
=
PROTOCOL__FLEX_HARQ_STATUS__FLHS_NACK
;
}
}
/*Fill in the serving cell index for this UE */
dl_info
[
i
]
->
serv_cell_index
=
UE_PCCID
(
mod_id
,
i
);
...
...
openair2/ENB_APP/MESSAGES/V2/stats_common.proto
View file @
46583d77
...
...
@@ -166,6 +166,7 @@ message flex_ul_cqi_report {
message
flex_pucch_dbm
{
optional
int32
p0_pucch_dbm
=
1
;
optional
uint32
serv_cell_index
=
2
;
optional
uint32
p0_pucch_updated
=
3
;
}
//
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
46583d77
...
...
@@ -516,15 +516,14 @@ uint16_t flexran_get_future_sfn_sf (mid_t mod_id, int ahead_of_time) {
subframe
=
(
sub_frame_t
)
flexran_get_current_subframe
(
mod_id
);
subframe
=
((
subframe
+
ahead_of_time
)
%
10
);
int
full_frames_ahead
=
((
ahead_of_time
/
10
)
%
10
);
frame
=
frame
+
full_frames_ahead
;
if
(
subframe
<
flexran_get_current_subframe
(
mod_id
))
{
frame
++
;
frame
=
(
frame
+
1
)
%
1024
;
}
int
additional_frames
=
ahead_of_time
/
10
;
frame
=
(
frame
+
additional_frames
)
%
1024
;
frame_mask
=
((
1
<<
12
)
-
1
);
sf_mask
=
((
1
<<
4
)
-
1
);
sfn_sf
=
(
subframe
&
sf_mask
)
|
((
frame
&
frame_mask
)
<<
4
);
...
...
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