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
b6375175
Commit
b6375175
authored
Aug 29, 2022
by
Vaibhav Shrivastava
Browse files
Options
Browse Files
Download
Plain Diff
Merged tc_8217_uni branch into Aug_Delivery_Unified_branch Branch
parents
354ccdbc
2df072e8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
52 additions
and
44 deletions
+52
-44
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+6
-6
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+44
-36
openair3/SS/ss_eNB_vt_timer_task.c
openair3/SS/ss_eNB_vt_timer_task.c
+2
-2
No files found.
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
b6375175
...
@@ -939,7 +939,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
...
@@ -939,7 +939,7 @@ uint8_t do_SIB1(rrc_eNB_carrier_data_t *carrier,
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM
)
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
;
(
*
sib1
)
->
cellSelectionInfo
.
q_RxLevMin
=
configuration
->
q_RxLevMin
;
}
}
else
else
...
@@ -1397,7 +1397,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
...
@@ -1397,7 +1397,7 @@ uint8_t do_SIB23(uint8_t Mod_id,
=
rrconfig
->
prach_root
;
=
rrconfig
->
prach_root
;
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
prach_ConfigIndex
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
prach_ConfigIndex
=
rrconfig
->
prach_config_index
;
=
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
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
highSpeedFlag
=
rrconfig
->
prach_high_speed
;
=
rrconfig
->
prach_high_speed
;
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
zeroCorrelationZoneConfig
(
*
sib2
)
->
radioResourceConfigCommon
.
prach_Config
.
prach_ConfigInfo
.
zeroCorrelationZoneConfig
...
@@ -2533,7 +2533,7 @@ do_RRCConnectionSetup(
...
@@ -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_Reordering
=
rrc
->
srb1_timer_reordering
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
rrc
->
srb1_timer_status_prohibit
;
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_lchan_config
=
CALLOC
(
1
,
sizeof
(
*
SRB1_lchan_config
));
SRB1_config
->
logicalChannelConfig
=
SRB1_lchan_config
;
SRB1_config
->
logicalChannelConfig
=
SRB1_lchan_config
;
...
@@ -2549,7 +2549,7 @@ do_RRCConnectionSetup(
...
@@ -2549,7 +2549,7 @@ do_RRCConnectionSetup(
//assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
//assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
SRB1_ul_SpecificParameters
->
prioritisedBitRate
=
LTE_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);
//assign_enum(&SRB1_ul_SpecificParameters->bucketSizeDuration,LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50);
SRB1_ul_SpecificParameters
->
bucketSizeDuration
=
LTE_LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50
;
SRB1_ul_SpecificParameters
->
bucketSizeDuration
=
LTE_LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50
;
logicalchannelgroup
=
CALLOC
(
1
,
sizeof
(
long
));
logicalchannelgroup
=
CALLOC
(
1
,
sizeof
(
long
));
...
@@ -3802,7 +3802,7 @@ uint16_t do_RRCConnectionReconfiguration(const protocol_ctxt_t *const ctxt_pP,
...
@@ -3802,7 +3802,7 @@ uint16_t do_RRCConnectionReconfiguration(const protocol_ctxt_t *const ctxt_pP,
buffer_size
);
buffer_size
);
if
(
enc_rval
.
encoded
==
-
1
)
{
if
(
enc_rval
.
encoded
==
-
1
)
{
LOG_
I
(
RRC
,
"[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!
\n
"
,
LOG_
W
(
RRC
,
"[eNB AssertFatal]ASN1 message encoding failed (%s, %lu)!
\n
"
,
enc_rval
.
failed_type
->
name
,
enc_rval
.
encoded
);
enc_rval
.
failed_type
->
name
,
enc_rval
.
encoded
);
return
-
1
;
return
-
1
;
}
}
...
@@ -4392,7 +4392,7 @@ uint8_t do_Paging(uint8_t Mod_id, uint8_t *buffer, size_t buffer_size,
...
@@ -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
;
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
nonCriticalExtension
=
NULL
;
asn_set_empty
(
&
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
->
list
);
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
=
CALLOC
(
1
,
sizeof
(
*
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
));
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
->
list
.
count
=
0
;
pcch_msg
.
message
.
choice
.
c1
.
choice
.
paging
.
pagingRecordList
->
list
.
count
=
0
;
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
b6375175
...
@@ -529,7 +529,7 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name
...
@@ -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
};
const
unsigned
int
Ttab
[
4
]
=
{
32
,
64
,
128
,
256
};
uint8_t
Tc
;
/* DRX cycle of UE */
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
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) */
uint32_t
Ns
=
0
;
/* Ns: max(1,nB/T) */
uint8_t
i_s
;
/* i_s = floor(UE_ID/N) mod Ns */
uint8_t
i_s
;
/* i_s = floor(UE_ID/N) mod Ns */
uint32_t
T
;
/* DRX cycle */
uint32_t
T
;
/* DRX cycle */
...
@@ -542,7 +542,7 @@ static int rrc_eNB_process_SS_PAGING_IND(MessageDef *msg_p, const char *msg_name
...
@@ -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
)
if
(
SS_PAGING_IND
(
msg_p
).
paging_recordList
)
{
{
LOG_A
(
RRC
,
"[eNB %
d] 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
.
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
.
mme_code
,
SS_PAGING_IND
(
msg_p
).
paging_recordList
->
ue_paging_identity
.
choice
.
s_tmsi
.
m_tmsi
,
SS_PAGING_IND
(
msg_p
).
paging_recordList
->
ue_paging_identity
.
choice
.
s_tmsi
.
m_tmsi
,
...
@@ -3071,7 +3071,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
...
@@ -3071,7 +3071,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
{
{
uint8_t
buffer
[
RRC_BUF_SIZE
];
uint8_t
buffer
[
RRC_BUF_SIZE
];
uint16_t
size
;
uint16_t
size
=
0
;
int
i
;
int
i
;
MessageDef
*
message_p
=
NULL
;
MessageDef
*
message_p
=
NULL
;
/* Configure SRB1/SRB2, PhysicalConfigDedicated, LTE_MAC_MainConfig for UE */
/* Configure SRB1/SRB2, PhysicalConfigDedicated, LTE_MAC_MainConfig for UE */
...
@@ -3784,8 +3784,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
...
@@ -3784,8 +3784,10 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
measurements_enabled
=
RC
.
rrc
[
ENB_INSTANCE_TO_MODULE_ID
(
ctxt_pP
->
instance
)]
->
configuration
.
enable_x2
||
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
;
RC
.
rrc
[
ENB_INSTANCE_TO_MODULE_ID
(
ctxt_pP
->
instance
)]
->
configuration
.
enable_measurement_reports
;
if
(
RC
.
ss
.
mode
==
SS_ENB
)
{
memset
(
buffer
,
0
,
sizeof
(
buffer
));
memset
(
buffer
,
0
,
sizeof
(
buffer
));
if
(
RC
.
ss
.
mode
==
SS_ENB
)
{
size
=
do_RRCConnectionReconfiguration
(
ctxt_pP
,
size
=
do_RRCConnectionReconfiguration
(
ctxt_pP
,
buffer
,
buffer
,
sizeof
(
buffer
),
sizeof
(
buffer
),
...
@@ -3811,8 +3813,15 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
...
@@ -3811,8 +3813,15 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
(
LTE_SL_DiscConfig_r12_t
*
)
NULL
,
(
LTE_SL_DiscConfig_r12_t
*
)
NULL
,
(
LTE_SCellToAddMod_r10_t
*
)
NULL
(
LTE_SCellToAddMod_r10_t
*
)
NULL
);
);
if
(
size
==
65535
)
{
LOG_E
(
RRC
,
"RRC encode err!!! do_RRCConnectionReconfiguration
\n
"
);
size
=
0
;
}
else
{
LOG_DUMPMSG
(
RRC
,
DEBUG_RRC
,(
char
*
)
buffer
,
size
,
"[MSG] RRC Connection Reconfiguration
\n
"
);
LOG_DUMPMSG
(
RRC
,
DEBUG_RRC
,(
char
*
)
buffer
,
size
,
"[MSG] RRC Connection Reconfiguration
\n
"
);
}
}
}
/* Free all NAS PDUs */
/* Free all NAS PDUs */
for
(
i
=
0
;
i
<
ue_context_pP
->
ue_context
.
nb_of_e_rabs
;
i
++
)
{
for
(
i
=
0
;
i
<
ue_context_pP
->
ue_context
.
nb_of_e_rabs
;
i
++
)
{
...
@@ -7599,7 +7608,7 @@ char rrc_eNB_rblist_configuration(
...
@@ -7599,7 +7608,7 @@ char rrc_eNB_rblist_configuration(
RC
.
RB_Config
[
rbIndex
].
DiscardULData
=
RblistConfig
->
rb_list
[
i
].
RbConfig
.
DiscardULData
;
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
,
"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
,
"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
);
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
);
...
@@ -10317,7 +10326,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10317,7 +10326,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
uint8_t
rb_idx
=
0
;
uint8_t
rb_idx
=
0
;
uint8_t
rbid_
;
uint8_t
rbid_
;
ss_get_pdcp_cnt_t
pc
;
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
);
SS_RRC_PDU_REQ
(
msg_p
).
rnti
,
instance
);
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
...
@@ -10379,7 +10388,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10379,7 +10388,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
struct
rrc_eNB_ue_context_s
*
ue_context_p
=
NULL
;
struct
rrc_eNB_ue_context_s
*
ue_context_p
=
NULL
;
ue_context_p
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
instance
],
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
ue_context_p
=
rrc_eNB_get_ue_context
(
RC
.
rrc
[
instance
],
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
RC
.
rrc_Transaction_Identifier
=
dl_dcch_msg
->
message
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration
.
rrc_TransactionIdentifier
;
RC
.
rrc_Transaction_Identifier
=
dl_dcch_msg
->
message
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration
.
rrc_TransactionIdentifier
;
LOG_A
(
RRC
,
"[eNB %ld] SRB2 Received SDU
for CCCH on SRB %ld rnti %d
\n
"
,
instance
,
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
LOG_A
(
RRC
,
"[eNB %ld] SRB2 Received SDU
on SRB %d rnti %d
\n
"
,
instance
,
SS_RRC_PDU_REQ
(
msg_p
).
srb_id
,
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
if
(
ue_context_p
&&
ue_context_p
->
ue_context
.
UE_Capability
==
NULL
)
if
(
ue_context_p
&&
ue_context_p
->
ue_context
.
UE_Capability
==
NULL
)
{
{
LOG_A
(
RRC
,
"[eNB %ld] SRB2 reconfigure on rnti %d
\n
"
,
instance
,
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
LOG_A
(
RRC
,
"[eNB %ld] SRB2 reconfigure on rnti %d
\n
"
,
instance
,
SS_RRC_PDU_REQ
(
msg_p
).
rnti
);
...
@@ -10450,7 +10459,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10450,7 +10459,6 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
module_id_t
Idx
;
module_id_t
Idx
;
LOG_A
(
RRC
,
"Received data on SRB0 from SS, module id: %d, Frame: %d, instance: %lu
\n
"
,
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
);
ctxt
.
module_id
,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
instance
);
eNB_RRC_UE_t
*
ue_p
=
&
ue_context_pP
->
ue_context
;
uper_decode
(
NULL
,
uper_decode
(
NULL
,
&
asn_DEF_LTE_DL_CCCH_Message
,
&
asn_DEF_LTE_DL_CCCH_Message
,
...
@@ -10517,7 +10525,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
...
@@ -10517,7 +10525,7 @@ void *rrc_enb_process_itti_msg(void *notUsed) {
//#endif
//#endif
case
SS_DRB_PDU_REQ
:
case
SS_DRB_PDU_REQ
:
LOG_A
(
RRC
,
"[eNB %d] RRC Received SS_DRB_PDU_REQ with RNTI: %d, Frame: %d, Slot: %d
\n
"
,
instance
,
SS_DRB_PDU_REQ
(
msg_p
).
rnti
,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
msg_p
->
ittiMsgHeader
.
lte_time
.
slot
);
LOG_A
(
RRC
,
"[eNB %
l
d] RRC Received SS_DRB_PDU_REQ with RNTI: %d, Frame: %d, Slot: %d
\n
"
,
instance
,
SS_DRB_PDU_REQ
(
msg_p
).
rnti
,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
msg_p
->
ittiMsgHeader
.
lte_time
.
slot
);
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
instance
,
instance
,
ENB_FLAG_YES
,
ENB_FLAG_YES
,
...
...
openair3/SS/ss_eNB_vt_timer_task.c
View file @
b6375175
...
@@ -126,7 +126,7 @@ static inline void ss_vt_timer_check(ss_set_timinfo_t tinfo)
...
@@ -126,7 +126,7 @@ static inline void ss_vt_timer_check(ss_set_timinfo_t tinfo)
hash_rc
=
hashtable_get
(
SS_context
.
vt_timer_table
,
(
hash_key_t
)
sfnSfKey
,
(
void
**
)
&
timer_ele_p
);
hash_rc
=
hashtable_get
(
SS_context
.
vt_timer_table
,
(
hash_key_t
)
sfnSfKey
,
(
void
**
)
&
timer_ele_p
);
LOG_A
(
ENB_APP
,
"VT_TIMER Enter check SFN %d , SF %d taskID %d timer_ele.task_id instance %d
\n
"
,
LOG_A
(
ENB_APP
,
"VT_TIMER Enter check SFN %d , SF %d taskID %d timer_ele.task_id instance %
l
d
\n
"
,
tinfo
.
sfn
,
tinfo
.
sf
,
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
);
tinfo
.
sfn
,
tinfo
.
sf
,
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
);
int
send_res
=
itti_send_msg_to_task
(
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
,
(
MessageDef
*
)
timer_ele_p
->
msg
);
int
send_res
=
itti_send_msg_to_task
(
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
,
(
MessageDef
*
)
timer_ele_p
->
msg
);
...
@@ -136,7 +136,7 @@ static inline void ss_vt_timer_check(ss_set_timinfo_t tinfo)
...
@@ -136,7 +136,7 @@ static inline void ss_vt_timer_check(ss_set_timinfo_t tinfo)
}
}
else
else
{
{
LOG_A
(
ENB_APP
,
"VT_TIMER Sent message to taskID %d timer_ele.task_id instance %d
\n
"
,
LOG_A
(
ENB_APP
,
"VT_TIMER Sent message to taskID %d timer_ele.task_id instance %
l
d
\n
"
,
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
);
timer_ele_p
->
task_id
,
timer_ele_p
->
instance
);
hash_rc
=
hashtable_remove
(
SS_context
.
vt_timer_table
,
(
hash_key_t
)
sfnSfKey
);
hash_rc
=
hashtable_remove
(
SS_context
.
vt_timer_table
,
(
hash_key_t
)
sfnSfKey
);
...
...
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