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
348da003
Commit
348da003
authored
Apr 11, 2017
by
Xenofon Foukas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed warnings and bugs
parent
71d15384
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
7 deletions
+25
-7
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+3
-1
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
...air2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
+2
-2
openair2/ENB_APP/flexran_agent_common.c
openair2/ENB_APP/flexran_agent_common.c
+2
-1
openair2/LAYER2/MAC/proto.h
openair2/LAYER2/MAC/proto.h
+1
-0
openair2/RRC/LITE/proto.h
openair2/RRC/LITE/proto.h
+17
-0
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+0
-3
No files found.
openair2/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
View file @
348da003
...
...
@@ -214,7 +214,9 @@ int flexran_agent_mac_stats_reply(mid_t mod_id,
goto
error
;
protocol__flex_csi_p11__init
(
csi11
);
csi11
->
wb_cqi
=
flexran_get_ue_wcqi
(
enb_id
,
i
);
csi11
->
wb_cqi
=
malloc
(
sizeof
(
csi11
->
wb_cqi
));
csi11
->
n_wb_cqi
=
1
;
csi11
->
wb_cqi
[
0
]
=
flexran_get_ue_wcqi
(
enb_id
,
i
);
// According To spec 36.213
if
(
flexran_get_antenna_ports
(
enb_id
,
j
)
==
2
&&
csi_reports
[
j
]
->
ri
==
1
)
{
...
...
openair2/ENB_APP/CONTROL_MODULES/RRC/flexran_agent_rrc_defs.h
View file @
348da003
...
...
@@ -54,8 +54,8 @@ typedef struct {
/// Notify the controller for a state change of a particular UE, by sending the proper
/// UE state change message (ACTIVATION, DEACTIVATION, HANDOVER)
int
(
*
flexran_agent_notify_ue_state_change
)(
mid_t
mod_id
,
uint32_t
rnti
,
uint
32
_t
state_change
);
void
(
*
flexran_agent_notify_ue_state_change
)(
mid_t
mod_id
,
uint32_t
rnti
,
uint
8
_t
state_change
);
void
(
*
flexran_trigger_rrc_measurements
)(
mid_t
mod_id
,
MeasResults_t
*
measResults
);
...
...
openair2/ENB_APP/flexran_agent_common.c
View file @
348da003
...
...
@@ -1075,7 +1075,8 @@ int flexran_agent_rrc_measurement(mid_t mod_id, const void *params, Protocol__Fl
int
flexran_agent_destroy_rrc_measurement
(
Protocol__FlexranMessage
*
msg
){
// TODO
return
0
;
}
...
...
openair2/LAYER2/MAC/proto.h
View file @
348da003
...
...
@@ -539,6 +539,7 @@ void sort_ue_ul (module_id_t module_idP,int frameP, sub_frame_t subframeP);
void
assign_max_mcs_min_rb
(
module_id_t
module_idP
,
int
frameP
,
sub_frame_t
subframeP
,
uint16_t
*
first_rb
);
void
adjust_bsr_info
(
int
buffer_occupancy
,
uint16_t
TBS
,
UE_TEMPLATE
*
UE_template
);
int
phy_stats_exist
(
module_id_t
Mod_id
,
int
rnti
);
void
sort_UEs
(
module_id_t
Mod_idP
,
int
frameP
,
sub_frame_t
subframeP
);
/*! \fn UE_L2_state_t ue_scheduler(const module_id_t module_idP,const frame_t frameP, const sub_frame_t subframe, const lte_subframe_t direction,const uint8_t eNB_index)
\brief UE scheduler where all the ue background tasks are done. This function performs the following: 1) Trigger PDCP every 5ms 2) Call RRC for link status return to PHY3) Perform SR/BSR procedures for scheduling feedback 4) Perform PHR procedures.
...
...
openair2/RRC/LITE/proto.h
View file @
348da003
...
...
@@ -33,6 +33,10 @@
#include "RRC/LITE/defs.h"
#if defined(FLEXRAN_AGENT_SB_IF)
#include "flexran_agent_extern.h"
#endif
//main.c
int
rrc_init_global_param
(
void
);
int
L3_xface_init
(
void
);
...
...
@@ -254,6 +258,19 @@ rrc_eNB_generate_defaultRRCConnectionReconfiguration(
const
uint8_t
ho_state
);
#if defined(FLEXRAN_AGENT_SB_IF)
void
flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
rrc_eNB_ue_context_t
*
const
ue_context_pP
,
const
uint8_t
ho_state
,
agent_reconf_rrc
*
trig_param
);
#endif
void
rrc_eNB_generate_dedeicatedRRCConnectionReconfiguration
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
...
...
openair2/RRC/LITE/rrc_eNB.c
View file @
348da003
...
...
@@ -93,9 +93,6 @@
#include "SIMULATION/TOOLS/defs.h" // for taus
#if defined(FLEXRAN_AGENT_SB_IF)
#include "flexran_agent_extern.h"
#endif
//#define XER_PRINT
#ifdef PHY_EMUL
...
...
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