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
1e6a3223
Commit
1e6a3223
authored
May 12, 2022
by
Manu Agrawal
Browse files
Options
Browse Files
Download
Plain Diff
RB list Rebase
parents
e0998464
16a52a41
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
597 additions
and
75 deletions
+597
-75
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+31
-10
openair2/RRC/LTE/rrc_common.c
openair2/RRC/LTE/rrc_common.c
+63
-0
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+503
-65
No files found.
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
1e6a3223
...
@@ -2492,21 +2492,42 @@ do_RRCConnectionSetup(
...
@@ -2492,21 +2492,42 @@ do_RRCConnectionSetup(
SRB1_rlc_config
=
CALLOC
(
1
,
sizeof
(
*
SRB1_rlc_config
));
SRB1_rlc_config
=
CALLOC
(
1
,
sizeof
(
*
SRB1_rlc_config
));
SRB1_config
->
rlc_Config
=
SRB1_rlc_config
;
SRB1_config
->
rlc_Config
=
SRB1_rlc_config
;
SRB1_rlc_config
->
present
=
LTE_SRB_ToAddMod__rlc_Config_PR_explicitValue
;
SRB1_rlc_config
->
present
=
LTE_SRB_ToAddMod__rlc_Config_PR_explicitValue
;
SRB1_rlc_config
->
choice
.
explicitValue
.
present
=
LTE_RLC_Config_PR_am
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
rrc
->
srb1_timer_poll_retransmit
;
//if (RC.mode == SS_SOFTMODEM)
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
rrc
->
srb1_poll_pdu
;
if
(
1
)
{
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
rrc
->
srb1_poll_byte
;
SRB1_rlc_config
->
choice
.
explicitValue
.
present
=
RC
.
RB_Config
[
1
].
RlcCfg
.
present
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
rrc
->
srb1_max_retx_threshold
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
rrc
->
srb1_timer_reordering
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
rrc
->
srb1_timer_status_prohibit
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollByte
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
;
}
else
{
SRB1_rlc_config
->
choice
.
explicitValue
.
present
=
LTE_RLC_Config_PR_am
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
rrc
->
srb1_timer_poll_retransmit
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
rrc
->
srb1_poll_pdu
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
rrc
->
srb1_poll_byte
;
SRB1_rlc_config
->
choice
.
explicitValue
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
rrc
->
srb1_max_retx_threshold
;
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
);
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
;
SRB1_lchan_config
->
present
=
LTE_SRB_ToAddMod__logicalChannelConfig_PR_explicitValue
;
SRB1_lchan_config
->
present
=
LTE_SRB_ToAddMod__logicalChannelConfig_PR_explicitValue
;
SRB1_ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
*
SRB1_ul_SpecificParameters
));
SRB1_ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
*
SRB1_ul_SpecificParameters
));
SRB1_lchan_config
->
choice
.
explicitValue
.
ul_SpecificParameters
=
SRB1_ul_SpecificParameters
;
SRB1_lchan_config
->
choice
.
explicitValue
.
ul_SpecificParameters
=
SRB1_ul_SpecificParameters
;
SRB1_ul_SpecificParameters
->
priority
=
1
;
//if (RC.mode == SS_SOFTMODEM)
//assign_enum(&SRB1_ul_SpecificParameters->prioritisedBitRate,LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity);
if
(
1
)
{
SRB1_ul_SpecificParameters
->
prioritisedBitRate
=
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity
;
SRB1_ul_SpecificParameters
->
priority
=
RC
.
RB_Config
[
1
].
Mac
.
ul_SpecificParameters
->
priority
;
SRB1_ul_SpecificParameters
->
prioritisedBitRate
=
RC
.
RB_Config
[
1
].
Mac
.
ul_SpecificParameters
->
prioritisedBitRate
;
}
else
{
SRB1_ul_SpecificParameters
->
priority
=
1
;
//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
);
//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
));
...
...
openair2/RRC/LTE/rrc_common.c
View file @
1e6a3223
...
@@ -77,6 +77,69 @@ rrc_init_global_param(
...
@@ -77,6 +77,69 @@ rrc_init_global_param(
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_poll_retransmit
=
15
;
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_poll_retransmit
=
15
;
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_reordering
=
50
;
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_reordering
=
50
;
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_status_prohibit
=
10
;
Rlc_info_am_config
.
rlc
.
rlc_am_info
.
t_status_prohibit
=
10
;
for
(
int
i
=
0
;
i
<
MAX_RBS
;
i
++
)
{
RC
.
RB_Config
[
i
].
isRBConfigValid
=
FALSE
;
memset
(
&
RC
.
RB_Config
[
i
],
0
,
sizeof
(
RBConfig
));
}
/*SRB1 Default Config for RLC and MAC*/
RC
.
RB_Config
[
1
].
RlcCfg
.
present
=
1
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
15
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
0
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
14
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
3
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
7
;
RC
.
RB_Config
[
1
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
0
;
RC
.
RB_Config
[
1
].
Mac
.
ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
struct
LTE_LogicalChannelConfig__ul_SpecificParameters
));
RC
.
RB_Config
[
1
].
Mac
.
ul_SpecificParameters
->
priority
=
1
;
RC
.
RB_Config
[
1
].
Mac
.
ul_SpecificParameters
->
prioritisedBitRate
=
7
;
/*SRB2 Default Config for RLC and MAC*/
RC
.
RB_Config
[
2
].
RlcCfg
.
present
=
LTE_RLC_Config_PR_am
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
LTE_T_PollRetransmit_ms15
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
LTE_PollPDU_p8
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
LTE_PollByte_kB1000
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
LTE_UL_AM_RLC__maxRetxThreshold_t32
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
LTE_T_Reordering_ms35
;
RC
.
RB_Config
[
2
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
LTE_T_StatusProhibit_ms10
;
RC
.
RB_Config
[
2
].
Mac
.
ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
struct
LTE_LogicalChannelConfig__ul_SpecificParameters
));
RC
.
RB_Config
[
2
].
Mac
.
ul_SpecificParameters
->
priority
=
3
;
RC
.
RB_Config
[
2
].
Mac
.
ul_SpecificParameters
->
prioritisedBitRate
=
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity
;
/*DRB Default Config for PDCP,RLC(AM) and MAC*/
RC
.
RB_Config
[
3
].
RlcCfg
.
present
=
LTE_RLC_Config_PR_am
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
t_PollRetransmit
=
LTE_T_PollRetransmit_ms50
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollPDU
=
LTE_PollPDU_p16
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
pollByte
=
LTE_PollByte_kBinfinity
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
ul_AM_RLC
.
maxRetxThreshold
=
LTE_UL_AM_RLC__maxRetxThreshold_t8
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_Reordering
=
LTE_T_Reordering_ms35
;
RC
.
RB_Config
[
3
].
RlcCfg
.
choice
.
am
.
dl_AM_RLC
.
t_StatusProhibit
=
LTE_T_StatusProhibit_ms25
;
RC
.
RB_Config
[
3
].
PdcpCfg
.
rlc_AM
=
CALLOC
(
1
,
sizeof
(
struct
LTE_PDCP_Config__rlc_AM
));
RC
.
RB_Config
[
3
].
PdcpCfg
.
rlc_AM
->
statusReportRequired
=
FALSE
;
RC
.
RB_Config
[
3
].
PdcpCfg
.
headerCompression
.
present
=
LTE_PDCP_Config__headerCompression_PR_notUsed
;
RC
.
RB_Config
[
3
].
Mac
.
ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
struct
LTE_LogicalChannelConfig__ul_SpecificParameters
));
RC
.
RB_Config
[
3
].
Mac
.
ul_SpecificParameters
->
priority
=
12
;
RC
.
RB_Config
[
3
].
Mac
.
ul_SpecificParameters
->
prioritisedBitRate
=
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_kBps8
;
RC
.
RB_Config
[
3
].
PdcpCfg
.
discardTimer
=
CALLOC
(
1
,
sizeof
(
long
));
*
(
RC
.
RB_Config
[
3
].
PdcpCfg
.
discardTimer
)
=
LTE_PDCP_Config__discardTimer_infinity
;
/*DRB Default Config for PDCP,RLC(UM) and MAC*/
RC
.
RB_Config
[
4
].
RlcCfg
.
present
=
LTE_RLC_Config_PR_um_Bi_Directional
;
RC
.
RB_Config
[
4
].
RlcCfg
.
choice
.
um_Bi_Directional
.
ul_UM_RLC
.
sn_FieldLength
=
LTE_SN_FieldLength_size10
;
RC
.
RB_Config
[
4
].
RlcCfg
.
choice
.
um_Bi_Directional
.
dl_UM_RLC
.
sn_FieldLength
=
LTE_SN_FieldLength_size10
;
RC
.
RB_Config
[
4
].
RlcCfg
.
choice
.
um_Bi_Directional
.
dl_UM_RLC
.
t_Reordering
=
LTE_T_Reordering_ms35
;
RC
.
RB_Config
[
4
].
PdcpCfg
.
rlc_UM
=
CALLOC
(
1
,
sizeof
(
struct
LTE_PDCP_Config__rlc_UM
));
RC
.
RB_Config
[
4
].
PdcpCfg
.
rlc_UM
->
pdcp_SN_Size
=
LTE_PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits
;
RC
.
RB_Config
[
4
].
PdcpCfg
.
headerCompression
.
present
=
LTE_PDCP_Config__headerCompression_PR_notUsed
;
RC
.
RB_Config
[
4
].
Mac
.
ul_SpecificParameters
=
CALLOC
(
1
,
sizeof
(
struct
LTE_LogicalChannelConfig__ul_SpecificParameters
));
RC
.
RB_Config
[
4
].
Mac
.
ul_SpecificParameters
->
priority
=
12
;
RC
.
RB_Config
[
4
].
Mac
.
ul_SpecificParameters
->
prioritisedBitRate
=
LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_kBps8
;
RC
.
RB_Config
[
4
].
PdcpCfg
.
discardTimer
=
CALLOC
(
1
,
sizeof
(
long
));
*
(
RC
.
RB_Config
[
4
].
PdcpCfg
.
discardTimer
)
=
LTE_PDCP_Config__discardTimer_infinity
;
return
0
;
return
0
;
}
}
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
1e6a3223
This diff is collapsed.
Click to expand it.
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