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
lizhongxiao
OpenXG-RAN
Commits
2df072e8
Commit
2df072e8
authored
Aug 25, 2022
by
Manu Agrawal
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed warnings
parent
baf5f92f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
12 deletions
+13
-12
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+5
-5
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+8
-7
No files found.
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
2df072e8
...
...
@@ -939,7 +939,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
{
LOG_D
(
RRC
,
"Updating q_RxLevMin: %d
\n
"
,
configuration
->
q_RxLevMin
);
LOG_D
(
RRC
,
"Updating q_RxLevMin: %
l
d
\n
"
,
configuration
->
q_RxLevMin
);
(
*
sib1
)
->
cellSelectionInfo
.
q_RxLevMin
=
configuration
->
q_RxLevMin
;
}
else
...
...
@@ -1397,7 +1397,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
=
rrconfig
->
prach_root
;
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
prach_ConfigIndex
=
rrconfig
->
prach_config_index
;
LOG_A
(
RRC
,
"SIB2 prach_config_index=%d
\n
"
,
rrconfig
->
prach_config_index
);
LOG_A
(
RRC
,
"SIB2 prach_config_index=%
l
d
\n
"
,
rrconfig
->
prach_config_index
);
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
highSpeedFlag
=
rrconfig
->
prach_high_speed
;
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
zeroCorrelationZoneConfig
...
...
@@ -2533,7 +2533,7 @@ do_RRCConnectionSetup(
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
rrc
->
srb1_timer_reordering
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
rrc
->
srb1_timer_status_prohibit
;
}
LOG_A
(
RRC
,
"do_RRCConnectionSetup: rlc config present: %d, am.ul_AM_RLC.t_PollRetransmit: %
d, am.ul_AM_RLC.pollPDU: %d, am.ul_AM_RLC.pollByte: %d, ul_AM_RLC.maxRetxThreshold: %d, am.dl_AM_RLC.t_Reordering: %d, am.dl_AM_RLC.t_StatusProhibit: %
d
\n
"
,
SRB1_rlc_config
->
choice
.
explicitValue
.
present
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollByte
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
);
LOG_A
(
RRC
,
"do_RRCConnectionSetup: rlc config present: %d, am.ul_AM_RLC.t_PollRetransmit: %
ld, am.ul_AM_RLC.pollPDU: %ld, am.ul_AM_RLC.pollByte: %ld, ul_AM_RLC.maxRetxThreshold: %ld, am.dl_AM_RLC.t_Reordering: %ld, am.dl_AM_RLC.t_StatusProhibit: %l
d
\n
"
,
SRB1_rlc_config
->
choice
.
explicitValue
.
present
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollByte
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
,
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
);
SRB1_lchan_config
=
CALLOC
(
1
,
sizeof
(
*
SRB1_lchan_config
));
SRB1_config
->
logicalChannelConfig
=
SRB1_lchan_config
;
...
...
@@ -2549,7 +2549,7 @@ do_RRCConnectionSetup(
//assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
SRB1_ul_SpecificParameters
->
prioritisedBitRate
=
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity
;
}
LOG_A
(
RRC
,
"do_RRCConnectionSetup: SRB1_ul_SpecificParameters->priority: %
d, SRB1_ul_SpecificParameters->prioritisedBitRate: %
d
\n
"
,
SRB1_ul_SpecificParameters
->
priority
,
SRB1_ul_SpecificParameters
->
prioritisedBitRate
);
LOG_A
(
RRC
,
"do_RRCConnectionSetup: SRB1_ul_SpecificParameters->priority: %
ld, SRB1_ul_SpecificParameters->prioritisedBitRate: %l
d
\n
"
,
SRB1_ul_SpecificParameters
->
priority
,
SRB1_ul_SpecificParameters
->
prioritisedBitRate
);
//assign_enum(&SRB1_ul_SpecificParameters->bucketSizeDuration,LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50);
SRB1_ul_SpecificParameters
->
bucketSizeDuration
=
LTE_LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50
;
logicalchannelgroup
=
CALLOC
(
1
,
sizeof
(
long
));
...
...
@@ -4392,7 +4392,7 @@ uint8_t do_Paging(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
nonCriticalExtension
=
NULL
;
asn_set_empty
(
&
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
->
list
);
if
(
ue_paging_identity
.
presenceMask
!=
LTE_PagingUE_Identity_PR_NOTHING
)
if
(
ue_paging_identity
.
presenceMask
!=
UE_PAGING_IDENTITY_NONE
)
{
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
=
CALLOC
(
1
,
sizeof
(
*
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
));
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
->
list
.
count
=
0
;
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
2df072e8
...
...
@@ -529,7 +529,7 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name
const unsigned int Ttab[4] = {32,64,128,256};
uint8_t Tc; /* DRX cycle of UE */
uint32_t pcch_nB; /* 4T, 2T, T, T/2, T/4, T/8, T/16, T/32 */
uint32_t N; /* N: min(T,nB). total count of PF in one DRX cycle */
uint32_t N
= 0
; /* N: min(T,nB). total count of PF in one DRX cycle */
uint32_t Ns = 0; /* Ns: max(1,nB/T) */
uint8_t i_s; /* i_s = floor(UE_ID/N) mod Ns */
uint32_t T; /* DRX cycle */
...
...
@@ -542,7 +542,7 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name
if (SS_PAGING_IND(msg_p).paging_recordList)
{
LOG_A(RRC, "[eNB %ld] In SS_PAGING_IND: MASK %d, S_TMSI mme_code %d, m_tmsi %
ld
SFN %d subframe %d cn_domain %d ue_index %d\n", instance,
LOG_A(RRC, "[eNB %ld] In SS_PAGING_IND: MASK %d, S_TMSI mme_code %d, m_tmsi %
u
SFN %d subframe %d cn_domain %d ue_index %d\n", instance,
SS_PAGING_IND(msg_p).paging_recordList->ue_paging_identity.presenceMask,
SS_PAGING_IND(msg_p).paging_recordList->ue_paging_identity.choice.s_tmsi.mme_code,
SS_PAGING_IND(msg_p).paging_recordList->ue_paging_identity.choice.s_tmsi.m_tmsi,
...
...
@@ -3064,7 +3064,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
//-----------------------------------------------------------------------------
{
uint8_t buffer[RRC_BUF_SIZE];
uint16_t size;
uint16_t size
=0
;
int i;
MessageDef *message_p = NULL;
/* Configure SRB1/SRB2, PhysicalConfigDedicated, LTE_MAC_MainConfig for UE */
...
...
@@ -3778,6 +3778,8 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
measurements_enabled = RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_x2 ||
RC.rrc[ENB_INSTANCE_TO_MODULE_ID(ctxt_pP->instance)]->configuration.enable_measurement_reports;
memset(buffer, 0, sizeof(buffer));
if (RC.ss.mode == SS_ENB)
{
size = do_RRCConnectionReconfiguration(ctxt_pP,
buffer,
sizeof(buffer),
...
...
@@ -3811,7 +3813,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
{
LOG_DUMPMSG(RRC, DEBUG_RRC,(char *)buffer, size, "[MSG] RRC Connection Reconfiguration\n");
}
}
/* Free all NAS PDUs */
for (i = 0; i < ue_context_pP->ue_context.nb_of_e_rabs; i++) {
if (ue_context_pP->ue_context.e_rab[i].param.nas_pdu.buffer != NULL) {
...
...
@@ -7598,7 +7600,7 @@ char rrc_eNB_rblist_configuration(
RC.RB_Config[rbIndex].DiscardULData = RblistConfig->rb_list[i].RbConfig.DiscardULData;
}
LOG_A(RRC,"PDCP Config discardTimer:
%li
\n",RC.RB_Config[rbIndex].PdcpCfg.discardTimer);
LOG_A(RRC,"PDCP Config discardTimer:
address=%p
\n",RC.RB_Config[rbIndex].PdcpCfg.discardTimer);
LOG_A(RRC,"Present RLC Config: %d \n",RC.RB_Config[rbIndex].RlcCfg.present);
LOG_A(RRC,"am.ul_AM_RLC.t_PollRetransmit: %ld , am.ul_AM_RLC.LTE_PollPDU_t:%ld, am.ul_AM_RLC.LTE_PollByte_t:%ld, am.ul_AM_RLC.maxRetxThreshold: %ld ,am.dl_AM_RLC.t_Reordering: %ld,am.dl_AM_RLC.t_StatusProhibit: %ld \n",RC.RB_Config[rbIndex].RlcCfg.choice.am.ul_AM_RLC.t_PollRetransmit,RC.RB_Config[rbIndex].RlcCfg.choice.am.ul_AM_RLC.pollPDU,RC.RB_Config[rbIndex].RlcCfg.choice.am.ul_AM_RLC.pollByte,RC.RB_Config[rbIndex].RlcCfg.choice.am.ul_AM_RLC.maxRetxThreshold,RC.RB_Config[rbIndex].RlcCfg.choice.am.dl_AM_RLC.t_Reordering, RC.RB_Config[rbIndex].RlcCfg.choice.am.dl_AM_RLC.t_StatusProhibit);
LOG_A(RRC,"um_Bi_Directional.ul_UM_RLC.sn_FieldLength: %ld, um_Bi_Directional.dl_UM_RLC.sn_FieldLength: %ld, um_Bi_Directional.dl_UM_RLC.t_Reordering: %ld \n",RC.RB_Config[rbIndex].RlcCfg.choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength,RC.RB_Config[rbIndex].RlcCfg.choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength,RC.RB_Config[rbIndex].RlcCfg.choice.um_Bi_Directional.dl_UM_RLC.t_Reordering);
...
...
@@ -10324,7 +10326,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
uint8_t rb_idx = 0;
uint8_t rbid_;
ss_get_pdcp_cnt_t pc;
LOG_A(RRC,"RRC received SS_RRC_PDU_REQ SRB_ID:%d SDU_SIZE:%d rnti %d in
tance %u
\n", SS_RRC_PDU_REQ (msg_p).srb_id, SS_RRC_PDU_REQ (msg_p).sdu_size,
LOG_A(RRC,"RRC received SS_RRC_PDU_REQ SRB_ID:%d SDU_SIZE:%d rnti %d in
stance %ld
\n", SS_RRC_PDU_REQ (msg_p).srb_id, SS_RRC_PDU_REQ (msg_p).sdu_size,
SS_RRC_PDU_REQ(msg_p).rnti,instance);
PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt,
...
...
@@ -10456,7 +10458,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
module_id_t Idx;
LOG_A(RRC, "Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu \n",
ctxt.module_id, msg_p->ittiMsgHeader.lte_time.frame, instance);
eNB_RRC_UE_t *ue_p = &ue_context_pP->ue_context;
RRCConnSetup_PDU_Present = true;
RRCConnSetup_PDUSize = SS_RRC_PDU_REQ(msg_p).sdu_size;
...
...
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