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
3740afec
Commit
3740afec
authored
Jan 16, 2018
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
consider changed RAN API
parent
56d4d0eb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
15 deletions
+20
-15
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+10
-7
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
+5
-4
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+5
-4
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
3740afec
...
...
@@ -219,21 +219,21 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
if
(
flexran_get_antenna_ports
(
enb_id
,
j
)
==
2
&&
csi_reports
[
j
]
->
ri
==
1
)
{
// TODO PMI
csi11
->
wb_pmi
=
flexran_get_ue_
pmi
(
enb_id
);
csi11
->
wb_pmi
=
flexran_get_ue_
wpmi
(
enb_id
,
i
,
0
);
csi11
->
has_wb_pmi
=
1
;
}
else
if
(
flexran_get_antenna_ports
(
enb_id
,
j
)
==
2
&&
csi_reports
[
j
]
->
ri
==
2
){
// TODO PMI
csi11
->
wb_pmi
=
flexran_get_ue_
pmi
(
enb_id
);
csi11
->
wb_pmi
=
flexran_get_ue_
wpmi
(
enb_id
,
i
,
0
);
csi11
->
has_wb_pmi
=
1
;
}
else
if
(
flexran_get_antenna_ports
(
enb_id
,
j
)
==
4
&&
csi_reports
[
j
]
->
ri
==
2
){
// TODO PMI
csi11
->
wb_pmi
=
flexran_get_ue_
pmi
(
enb_id
);
csi11
->
wb_pmi
=
flexran_get_ue_
wpmi
(
enb_id
,
i
,
0
);
csi11
->
has_wb_pmi
=
1
;
...
...
@@ -868,13 +868,16 @@ int flexran_agent_mac_sf_trigger(mid_t mod_id, const void *params, Protocol__Fle
protocol__flex_ul_info__init
(
ul_info
[
i
]);
ul_info
[
i
]
->
rnti
=
flexran_get_ue_crnti
(
mod_id
,
i
);
ul_info
[
i
]
->
has_rnti
=
1
;
/*Fill in the Tx power control command for this UE (if available)*/
if
(
flexran_get_tpc
(
mod_id
,
i
)
!=
1
){
ul_info
[
i
]
->
tpc
=
flexran_get_tpc
(
mod_id
,
i
);
/* Fill in the Tx power control command for this UE (if available),
* primary carrier */
if
(
flexran_get_tpc
(
mod_id
,
i
,
0
)
!=
1
){
/* assume primary carrier */
ul_info
[
i
]
->
tpc
=
flexran_get_tpc
(
mod_id
,
i
,
0
);
ul_info
[
i
]
->
has_tpc
=
1
;
}
else
{
ul_info
[
i
]
->
tpc
=
flexran_get_tpc
(
mod_id
,
i
);
/* assume primary carrier */
ul_info
[
i
]
->
tpc
=
flexran_get_tpc
(
mod_id
,
i
,
0
);
ul_info
[
i
]
->
has_tpc
=
0
;
}
/*TODO: fill in the amount of data in bytes in the MAC SDU received in this subframe for the
...
...
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc.c
View file @
3740afec
...
...
@@ -165,9 +165,10 @@ void flexran_agent_ue_state_change(mid_t mod_id, uint32_t rnti, uint8_t state_ch
config
->
beta_offset_cqi_index
=
flexran_get_beta_offset_cqi_index
(
mod_id
,
i
);
}
if
(
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
)
!=
-
1
)
{
/* assume primary carrier */
if
(
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
,
0
)
!=
-
1
)
{
config
->
has_ack_nack_simultaneous_trans
=
1
;
config
->
ack_nack_simultaneous_trans
=
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
);
config
->
ack_nack_simultaneous_trans
=
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
,
0
);
}
if
(
flexran_get_simultaneous_ack_nack_cqi
(
mod_id
,
i
)
!=
-
1
)
{
...
...
@@ -185,9 +186,9 @@ void flexran_agent_ue_state_change(mid_t mod_id, uint32_t rnti, uint8_t state_ch
}
}
if
(
flexran_get_tdd_ack_nack_feedback
(
mod_id
,
i
)
!=
-
1
)
{
if
(
flexran_get_tdd_ack_nack_feedback
_mode
(
mod_id
,
i
)
!=
-
1
)
{
config
->
has_tdd_ack_nack_feedback
=
1
;
config
->
tdd_ack_nack_feedback
=
flexran_get_tdd_ack_nack_feedback
(
mod_id
,
i
);
config
->
tdd_ack_nack_feedback
=
flexran_get_tdd_ack_nack_feedback
_mode
(
mod_id
,
i
);
}
if
(
flexran_get_ack_nack_repetition_factor
(
mod_id
,
i
)
!=
-
1
)
{
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
3740afec
...
...
@@ -676,9 +676,10 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
ue_config
[
i
]
->
beta_offset_cqi_index
=
flexran_get_beta_offset_cqi_index
(
mod_id
,
i
);
}
if
(
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
)
!=
-
1
)
{
/* assume primary carrier */
if
(
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
,
0
)
!=
-
1
)
{
ue_config
[
i
]
->
has_ack_nack_simultaneous_trans
=
1
;
ue_config
[
i
]
->
ack_nack_simultaneous_trans
=
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
);
ue_config
[
i
]
->
ack_nack_simultaneous_trans
=
flexran_get_ack_nack_simultaneous_trans
(
mod_id
,
i
,
0
);
}
if
(
flexran_get_simultaneous_ack_nack_cqi
(
mod_id
,
i
)
!=
-
1
)
{
...
...
@@ -696,9 +697,9 @@ int flexran_agent_ue_config_reply(mid_t mod_id, const void *params, Protocol__Fl
}
}
if
(
flexran_get_tdd_ack_nack_feedback
(
mod_id
,
i
)
!=
-
1
)
{
if
(
flexran_get_tdd_ack_nack_feedback
_mode
(
mod_id
,
i
)
!=
-
1
)
{
ue_config
[
i
]
->
has_tdd_ack_nack_feedback
=
1
;
ue_config
[
i
]
->
tdd_ack_nack_feedback
=
flexran_get_tdd_ack_nack_feedback
(
mod_id
,
i
);
ue_config
[
i
]
->
tdd_ack_nack_feedback
=
flexran_get_tdd_ack_nack_feedback
_mode
(
mod_id
,
i
);
}
if
(
flexran_get_ack_nack_repetition_factor
(
mod_id
,
i
)
!=
-
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