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
alex037yang
OpenXG-RAN
Commits
2f4e495a
Commit
2f4e495a
authored
Mar 13, 2019
by
lfarizav
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaning comments. Now, I will solve the Max user count reach message at the RCC.
parent
34ff17c3
Changes
9
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
114 additions
and
121 deletions
+114
-121
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+2
-2
openair2/LAYER2/MAC/ra_procedures.c
openair2/LAYER2/MAC/ra_procedures.c
+2
-2
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+0
-7
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
+2
-2
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
+2
-2
openair2/RRC/LITE/L2_interface.c
openair2/RRC/LITE/L2_interface.c
+20
-20
openair2/RRC/LITE/rrc_UE.c
openair2/RRC/LITE/rrc_UE.c
+82
-82
openair3/NAS/UE/nas_ue_task.c
openair3/NAS/UE/nas_ue_task.c
+2
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
...-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
+2
-2
No files found.
openair1/SCHED/phy_procedures_lte_ue.c
View file @
2f4e495a
...
...
@@ -1402,7 +1402,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc, uint8_t empt
}
void
ue_prach_procedures
(
PHY_VARS_UE
*
ue
,
UE_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
abstraction_flag
,
runmode_t
mode
)
{
printf
(
"ue_prach_procedures: UE %d, eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d
\n
"
,
ue
->
Mod_id
,
eNB_id
,
ue
->
common_vars
.
eNb_id
,
ue
->
mac_enabled
==
1
);
//
printf("ue_prach_procedures: UE %d, eNB_id %d, ue->common_vars.eNb.id %d, mac enabled %d\n",ue->Mod_id,eNB_id,ue->common_vars.eNb_id,ue->mac_enabled==1);
int
frame_tx
=
proc
->
frame_tx
;
int
subframe_tx
=
proc
->
subframe_tx
;
int
prach_power
;
...
...
@@ -2547,7 +2547,7 @@ void phy_procedures_UE_TX(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,ui
// check if we have PRACH opportunity
if
(
is_prach_subframe
(
&
ue
->
frame_parms
,
frame_tx
,
subframe_tx
))
{
printf
(
"prach_procedures: eNB_id %d, ue-eNB_id %d
\n
"
,
eNB_id
,
ue
->
common_vars
.
eNb_id
);
//
printf("prach_procedures: eNB_id %d, ue-eNB_id %d\n",eNB_id,ue->common_vars.eNb_id);
ue_prach_procedures
(
ue
,
proc
,
eNB_id
,
abstraction_flag
,
mode
);
}
}
// mode is PRACH
...
...
openair2/LAYER2/MAC/ra_procedures.c
View file @
2f4e495a
...
...
@@ -108,7 +108,7 @@ void get_prach_resources(module_id_t module_idP,
uint8_t
first_Msg3
,
RACH_ConfigDedicated_t
*
rach_ConfigDedicated
)
{
printf
(
"get_prach_resources: eNB_index %d
\n
"
,
eNB_index
);
//
printf("get_prach_resources: eNB_index %d\n",eNB_index);
uint8_t
Msg3_size
=
UE_mac_inst
[
module_idP
].
RA_Msg3_size
;
PRACH_RESOURCES_t
*
prach_resources
=
&
UE_mac_inst
[
module_idP
].
RA_prach_resources
;
RACH_ConfigCommon_t
*
rach_ConfigCommon
=
NULL
;
...
...
@@ -307,7 +307,7 @@ void Msg3_tx(module_id_t module_idP,uint8_t CC_id,frame_t frameP, uint8_t eNB_id
PRACH_RESOURCES_t
*
ue_get_rach
(
module_id_t
module_idP
,
int
CC_id
,
frame_t
frameP
,
uint8_t
eNB_indexP
,
sub_frame_t
subframeP
)
{
printf
(
"ue_get_rach: eNB_indexP %d
\n
"
,
eNB_indexP
);
//eNB_indexP=0
//
printf("ue_get_rach: eNB_indexP %d\n",eNB_indexP);//eNB_indexP=0
uint8_t
Size
=
0
;
UE_MODE_t
UE_mode
=
mac_xface
->
get_ue_mode
(
module_idP
,
0
,
eNB_indexP
);
//eNB_indexP=0
uint8_t
lcid
=
CCCH
;
...
...
openair2/LAYER2/MAC/ue_procedures.c
View file @
2f4e495a
...
...
@@ -375,13 +375,6 @@ ue_send_sdu(
LOG_T
(
MAC
,
"
\n
"
);
#endif
printf
(
"[UE %d] First 32 bytes of DLSCH :
\n
"
,
module_idP
);
for
(
i
=
0
;
i
<
32
;
i
++
)
{
printf
(
"%x."
,
sdu
[
i
]);
}
printf
(
"
\n
"
);
if
(
payload_ptr
!=
NULL
)
{
for
(
i
=
0
;
i
<
num_ce
;
i
++
)
{
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
View file @
2f4e495a
...
...
@@ -816,7 +816,7 @@ pdcp_data_ind(
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
rb_id
=
rb_id
;
#if defined(OAI_EMU)
((
pdcp_data_ind_header_t
*
)
new_sdu_p
->
data
)
->
inst
=
ctxt_pP
->
module_id
+
1
/*oai_emulation.info.nb_enb_local*/
-
oai_emulation
.
info
.
first_ue_local
;
printf
(
"pdcp_data_ind: inst %d, ctxt_pP->module_id %d, oai_emulation.info.nb_enb_local %d, oai_emulation.info.first_ue_local %d
\n
"
,
ctxt_pP
->
module_id
+
oai_emulation
.
info
.
nb_enb_local
-
oai_emulation
.
info
.
first_ue_local
,
ctxt_pP
->
module_id
,
oai_emulation
.
info
.
nb_enb_local
,
oai_emulation
.
info
.
first_ue_local
);
//
printf("pdcp_data_ind: inst %d, ctxt_pP->module_id %d, oai_emulation.info.nb_enb_local %d, oai_emulation.info.first_ue_local %d\n",ctxt_pP->module_id + oai_emulation.info.nb_enb_local - oai_emulation.info.first_ue_local,ctxt_pP->module_id , oai_emulation.info.nb_enb_local , oai_emulation.info.first_ue_local);
#else
# if defined(ENABLE_USE_MME)
/* for the UE compiled in S1 mode, we need 1 here
...
...
@@ -928,7 +928,7 @@ pdcp_run (
RRC_DCCH_DATA_REQ
(
msg_p
).
frame
,
0
,
RRC_DCCH_DATA_REQ
(
msg_p
).
eNB_index
);
printf
(
"pdcp_run:RRC_DCCH_DATA_REQ: eNB %d, rnti %x
\n
"
,
RRC_DCCH_DATA_REQ
(
msg_p
).
eNB_index
,
RRC_DCCH_DATA_REQ
(
msg_p
).
rnti
);
//
printf("pdcp_run:RRC_DCCH_DATA_REQ: eNB %d, rnti %x\n",RRC_DCCH_DATA_REQ (msg_p).eNB_index,RRC_DCCH_DATA_REQ (msg_p).rnti);
LOG_I
(
PDCP
,
PROTOCOL_CTXT_FMT
"Received %s from %s: instance %d, rb_id %d, muiP %d, confirmP %d, mode %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
msg_name
,
...
...
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
View file @
2f4e495a
...
...
@@ -549,8 +549,8 @@ int pdcp_fifo_read_input_sdus (const protocol_ctxt_t* const ctxt_pP)
LOG_D
(
PDCP
,
"[PDCP][NETLINK] Something in socket, length %zu
\n
"
,
nas_nlh_rx
->
nlmsg_len
-
sizeof
(
struct
nlmsghdr
));
#endif
printf
(
"[PDCP][NETLINK] Something in socket, length %zu, ctxt.module_id %d
\n
"
,
nas_nlh_rx
->
nlmsg_len
-
sizeof
(
struct
nlmsghdr
),
ctxt
.
module_id
);
//
printf("[PDCP][NETLINK] Something in socket, length %zu, ctxt.module_id %d\n",
//
nas_nlh_rx->nlmsg_len - sizeof(struct nlmsghdr),ctxt.module_id);
#ifdef OAI_EMU
// overwrite function input parameters, because only one netlink socket for all instances
...
...
openair2/RRC/LITE/L2_interface.c
View file @
2f4e495a
...
...
@@ -72,7 +72,7 @@ mac_rrc_data_req(
)
//--------------------------------------------------------------------------
{
printf
(
"mac_rrc_data_req:eNB_index %d, UE %d, CC_id %d, enb_flag activated? %d
\n
"
,
eNB_index
,
Mod_idP
,
CC_id
,
enb_flagP
==
ENB_FLAG_YES
);
//eNB_index=ue->common_vars.enb_id
//
printf("mac_rrc_data_req:eNB_index %d, UE %d, CC_id %d, enb_flag activated? %d\n",eNB_index,Mod_idP,CC_id,enb_flagP == ENB_FLAG_YES);//eNB_index=ue->common_vars.enb_id
SRB_INFO
*
Srb_info
;
uint8_t
Sdu_size
=
0
;
...
...
@@ -348,7 +348,7 @@ mac_rrc_data_ind(
SRB_INFO
*
Srb_info
;
protocol_ctxt_t
ctxt
;
sdu_size_t
sdu_size
=
0
;
printf
(
"mac_rrc_data_ind: eNB_indexP %d, ctxt->instance %d, ctxt->module_id %d
\n
"
,
eNB_indexP
,
ctxt
.
instance
,
ctxt
.
module_id
);
//eNB_index=ue->common_vars.enb_id
//
printf("mac_rrc_data_ind: eNB_indexP %d, ctxt->instance %d, ctxt->module_id %d\n",eNB_indexP,ctxt.instance,ctxt.module_id);//eNB_index=ue->common_vars.enb_id
/* for no gcc warnings */
(
void
)
sdu_size
;
...
...
@@ -536,7 +536,7 @@ rrc_data_req(
sdu_sizeP
);
#if defined(ENABLE_ITTI)
printf
(
"ENABLE_ITTI is on
\n
"
);
//printf("ENABLE_ITTI is on\n");yes
{
MessageDef
*
message_p
;
// Uses a new buffer to avoid issue with PDCP buffer content that could be changed by PDCP (asynchronous message handling).
...
...
@@ -561,12 +561,12 @@ printf("ENABLE_ITTI is on\n");
RRC_DCCH_DATA_REQ
(
message_p
).
module_id
=
ctxt_pP
->
module_id
;
RRC_DCCH_DATA_REQ
(
message_p
).
rnti
=
ctxt_pP
->
rnti
;
RRC_DCCH_DATA_REQ
(
message_p
).
eNB_index
=
ctxt_pP
->
eNB_index
;
printf
(
"RRC_DCCH_DATA_REQ (message_p): frame %d, enb_flag %d, rb_id %d, muip %d, confirmp %d, sdu_size %d, sdu_p %d, mode %d, module_id %d, rnti %x, eNB_index %d
\n
"
,
ctxt_pP
->
frame
,
ctxt_pP
->
enb_flag
,
rb_idP
,
muiP
,
confirmP
,
sdu_sizeP
,
*
message_buffer
,
modeP
,
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
,
ctxt_pP
->
eNB_index
);
//
printf("RRC_DCCH_DATA_REQ (message_p): frame %d, enb_flag %d, rb_id %d, muip %d, confirmp %d, sdu_size %d, sdu_p %d, mode %d, module_id %d, rnti %x, eNB_index %d\n",ctxt_pP->frame,ctxt_pP->enb_flag,rb_idP,muiP,confirmP,sdu_sizeP,*message_buffer,modeP,ctxt_pP->module_id,ctxt_pP->rnti,ctxt_pP->eNB_index);
itti_send_msg_to_task
(
ctxt_pP
->
enb_flag
?
TASK_PDCP_ENB
:
TASK_PDCP_UE
,
ctxt_pP
->
instance
,
message_p
);
printf
(
"rrc_data_req: ctxt_pP->instance %d, ctxt_pP->module_id %d
\n
"
,
ctxt_pP
->
instance
,
ctxt_pP
->
module_id
);
//
printf("rrc_data_req: ctxt_pP->instance %d, ctxt_pP->module_id %d\n",ctxt_pP->instance,ctxt_pP->module_id);
return
TRUE
;
// TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
}
...
...
@@ -672,20 +672,20 @@ void rrc_in_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index)
}
#endif
printf
(
"rrc_in_sync_ind:eNB_index %d
\n
"
,
eNB_index
);
//enb_id=ue->common_vars.enb_id
printf
(
"[UE %d] Frame %d: IN SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)
\n
"
,
Mod_idP
,
frameP
,
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
T310_active
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
T310_cnt
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N310_cnt
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N311_cnt
);
//
printf("rrc_in_sync_ind:eNB_index %d\n",eNB_index);//enb_id=ue->common_vars.enb_id
//
printf("[UE %d] Frame %d: IN SYNC FROM eNB %d (T310 active %d : T310 %d, N310 %d, N311 %d)\n ",
//
Mod_idP,frameP,eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].T310_active,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].T310_cnt,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].N310_cnt,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].N311_cnt);
}
//-------------------------------------------------------------------------------------------//
void
rrc_out_of_sync_ind
(
module_id_t
Mod_idP
,
frame_t
frameP
,
uint16_t
eNB_index
)
{
//-------------------------------------------------------------------------------------------//
printf
(
"rrc_out_of_sync_ind:eNB_index %d
\n
"
,
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
);
//
printf("rrc_out_of_sync_ind:eNB_index %d\n",eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/);
if
(
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N310_cnt
>
10
)
LOG_I
(
RRC
,
"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T300 active %d : T310 %d, N310 %d, N311 %d)
\n
"
,
Mod_idP
,
frameP
,
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
,
...
...
@@ -707,12 +707,12 @@ void rrc_out_of_sync_ind(module_id_t Mod_idP, frame_t frameP, uint16_t eNB_index
#else
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N310_cnt
++
;
#endif
printf
(
"[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T300 active %d : T310 %d, N310 %d, N311 %d)
\n
"
,
Mod_idP
,
frameP
,
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
T300_active
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
T310_cnt
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N310_cnt
,
UE_rrc_inst
[
Mod_idP
].
Info
[
eNB_index
/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/
].
N311_cnt
);
//
printf("[UE %d] Frame %d: OUT OF SYNC FROM eNB %d (T300 active %d : T310 %d, N310 %d, N311 %d)\n ",
//
Mod_idP,frameP,eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].T300_active,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].T310_cnt,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].N310_cnt,
//
UE_rrc_inst[Mod_idP].Info[eNB_index/*PHY_vars_UE_g[Mod_idP][0]->common_vars.eNb_id*/].N311_cnt);
}
//------------------------------------------------------------------------------
...
...
@@ -784,7 +784,7 @@ mac_UE_get_rrc_status(
)
//------------------------------------------------------------------------------
{
printf
(
"mac_UE_get_rrc_status:eNB_index %d
\n
"
,
indexP
);
//
printf("mac_UE_get_rrc_status:eNB_index %d\n",indexP);
return
(
UE_rrc_inst
[
Mod_idP
].
Info
[
indexP
].
State
);
}
...
...
openair2/RRC/LITE/rrc_UE.c
View file @
2f4e495a
This diff is collapsed.
Click to expand it.
openair3/NAS/UE/nas_ue_task.c
View file @
2f4e495a
...
...
@@ -50,7 +50,7 @@ static int nas_ue_process_events(nas_user_container_t *users, struct epoll_event
int
exit_loop
=
FALSE
;
LOG_I
(
NAS
,
"[UE] Received %d events
\n
"
,
nb_events
);
printf
(
"[UE] Received %d events
\n
"
,
nb_events
);
//
printf("[UE] Received %d events\n", nb_events);
for
(
event
=
0
;
event
<
nb_events
;
event
++
)
{
if
(
events
[
event
].
events
!=
0
)
{
/* If the event has not been yet been processed (not an itti message) */
...
...
@@ -155,7 +155,7 @@ void *nas_ue_task(void *args_p)
msg_name
=
ITTI_MSG_NAME
(
msg_p
);
instance
=
ITTI_MSG_INSTANCE
(
msg_p
);
Mod_id
=
instance
-
1
/*NB_eNB_INST*/
;
printf
(
"nas_ue_task: instance %d, INSTANCE_DEFAULT %d
\n
"
,
instance
,
INSTANCE_DEFAULT
);
//
printf("nas_ue_task: instance %d, INSTANCE_DEFAULT %d\n",instance,INSTANCE_DEFAULT);
if
(
instance
==
INSTANCE_DEFAULT
)
{
printf
(
"%s:%d: FATAL: instance is INSTANCE_DEFAULT, should not happen.
\n
"
,
__FILE__
,
__LINE__
);
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/rru.band7.tm1.if4p5.25PRB.oaisim.2RRUs.conf
View file @
2f4e495a
...
...
@@ -50,7 +50,7 @@ eNBs =
pucch_nRB_CQI
=
1
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pdsch_referenceSignalPower
= -
2
7
;
pdsch_referenceSignalPower
= -
2
9
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
...
...
@@ -238,7 +238,7 @@ eNBs =
pucch_nRB_CQI
=
1
;
pucch_nCS_AN
=
0
;
pucch_n1_AN
=
32
;
pdsch_referenceSignalPower
= -
2
7
;
pdsch_referenceSignalPower
= -
2
9
;
pdsch_p_b
=
0
;
pusch_n_SB
=
1
;
pusch_enable64QAM
=
"DISABLE"
;
...
...
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