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
Expand all
Hide 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
This diff is collapsed.
Click to expand it.
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