Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
21baaa5e
Commit
21baaa5e
authored
Sep 03, 2019
by
Stefan Schaffelder
Committed by
LouisAdrien
Sep 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asn1_msg.do_DrxConfig
parent
927eeff2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
34 deletions
+34
-34
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+31
-30
openair2/RRC/LTE/MESSAGES/asn1_msg.h
openair2/RRC/LTE/MESSAGES/asn1_msg.h
+1
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+2
-2
No files found.
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
21baaa5e
...
...
@@ -625,10 +625,9 @@ uint8_t do_SIB1_MBMS(rrc_eNB_carrier_data_t *carrier,
/*
* Generate the configuration structure for CDRX feature
*/
LTE_DRX_Config_t
*
do_DrxConfig
(
uint8_t
Mod_id
,
int
CC_id
,
RrcConfigurationReq
*
configuration
,
LTE_UE_EUTRA_Capability_t
*
UEcap
)
LTE_DRX_Config_t
*
do_DrxConfig
(
int
CC_id
,
RrcConfigurationReq
*
configuration
,
LTE_UE_EUTRA_Capability_t
*
UEcap
)
//-----------------------------------------------------------------------------
{
LTE_DRX_Config_t
*
drxConfig
=
NULL
;
...
...
@@ -666,58 +665,60 @@ LTE_DRX_Config_t *do_DrxConfig(uint8_t Mod_id,
if
(
drxConfig
->
present
==
LTE_DRX_Config_PR_release
)
{
drxConfig
->
choice
.
release
=
(
NULL_t
)
0
;
}
else
{
drxConfig
->
choice
.
setup
.
onDurationTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_onDurationTimer
;
drxConfig
->
choice
.
setup
.
drx_InactivityTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_InactivityTimer
;
drxConfig
->
choice
.
setup
.
drx_RetransmissionTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_RetransmissionTimer
;
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
present
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset_present
;
switch
(
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
present
)
{
struct
LTE_DRX_Config__setup
*
choiceSetup
=
&
drxConfig
->
choice
.
setup
;
choiceSetup
->
onDurationTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_onDurationTimer
;
// drxConfig->choice.setup.onDurationTimer = configuration->radioresourceconfig[CC_id].drx_onDurationTimer;
choiceSetup
->
drx_InactivityTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_InactivityTimer
;
choiceSetup
->
drx_RetransmissionTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_RetransmissionTimer
;
choiceSetup
->
longDRX_CycleStartOffset
.
present
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset_present
;
switch
(
choiceSetup
->
longDRX_CycleStartOffset
.
present
)
{
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf10
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf10
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf10
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf20
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf20
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf20
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf32
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf32
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf32
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf40
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf40
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf40
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf64
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf64
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf64
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf80
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf80
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf80
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf128
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf128
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf128
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf160
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf160
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf160
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf256
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf256
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf256
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf320
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf320
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf320
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf512
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf512
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf512
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf640
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf640
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf640
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf1024
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf1024
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf1024
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf1280
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf1280
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf1280
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf2048
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf2048
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf2048
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
case
LTE_DRX_Config__setup__longDRX_CycleStartOffset_PR_sf2560
:
drxConfig
->
choice
.
setup
.
longDRX_CycleStartOffset
.
choice
.
sf2560
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
choiceSetup
->
longDRX_CycleStartOffset
.
choice
.
sf2560
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_longDrx_CycleStartOffset
;
break
;
default:
break
;
...
...
@@ -725,12 +726,12 @@ LTE_DRX_Config_t *do_DrxConfig(uint8_t Mod_id,
/* Short DRX cycle configuration */
if
(
!
ueSupportCdrxShortFlag
||
configuration
->
radioresourceconfig
[
CC_id
].
drx_shortDrx_ShortCycleTimer
==
0
)
{
drxConfig
->
choice
.
setup
.
shortDRX
=
NULL
;
choiceSetup
->
shortDRX
=
NULL
;
}
else
{
drxConfig
->
choice
.
setup
.
shortDRX
=
MALLOC
(
sizeof
(
struct
LTE_DRX_Config__setup__shortDRX
));
memset
(
drxConfig
->
choice
.
setup
.
shortDRX
,
0
,
sizeof
(
struct
LTE_DRX_Config__setup__shortDRX
));
drxConfig
->
choice
.
setup
.
shortDRX
->
shortDRX_Cycle
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_shortDrx_Cycle
;
drxConfig
->
choice
.
setup
.
shortDRX
->
drxShortCycleTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_shortDrx_ShortCycleTimer
;
choiceSetup
->
shortDRX
=
MALLOC
(
sizeof
(
struct
LTE_DRX_Config__setup__shortDRX
));
memset
(
choiceSetup
->
shortDRX
,
0
,
sizeof
(
struct
LTE_DRX_Config__setup__shortDRX
));
choiceSetup
->
shortDRX
->
shortDRX_Cycle
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_shortDrx_Cycle
;
choiceSetup
->
shortDRX
->
drxShortCycleTimer
=
configuration
->
radioresourceconfig
[
CC_id
].
drx_shortDrx_ShortCycleTimer
;
}
}
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.h
View file @
21baaa5e
...
...
@@ -81,12 +81,11 @@ uint8_t do_MIB(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_t phich
uint8_t
do_MIB_FeMBMS
(
rrc_eNB_carrier_data_t
*
carrier
,
uint32_t
N_RB_DL
,
uint32_t
additionalNonMBSFNSubframes
,
uint32_t
frame
);
/**
\brief Generate configuration structure for DRX_Config
@param Mod_id Instance of eNB
@param CC_id Id of component to configure
@param configuration Pointer Configuration Request structure
@param UEcap Pointer Configuration UE capablities
@return DRX_Config structure pointer or NULL => error */
LTE_DRX_Config_t
*
do_DrxConfig
(
uint8_t
Mod_id
,
int
CC_id
,
RrcConfigurationReq
*
configuration
,
LTE_UE_EUTRA_Capability_t
*
UEcap
);
LTE_DRX_Config_t
*
do_DrxConfig
(
int
CC_id
,
RrcConfigurationReq
*
configuration
,
LTE_UE_EUTRA_Capability_t
*
UEcap
);
/**
\brief Generate configuration for SIB1 (eNB).
...
...
openair2/RRC/LTE/rrc_eNB.c
View file @
21baaa5e
...
...
@@ -3219,7 +3219,7 @@ void rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt_t
/* Process the IE drx_Config */
if
(
cc_id
<
MAX_NUM_CCs
)
{
mac_MainConfig
->
drx_Config
=
do_DrxConfig
(
module_id
,
cc_id
,
&
rrc_inst
->
configuration
,
UEcap
);
// drx_Config IE
mac_MainConfig
->
drx_Config
=
do_DrxConfig
(
cc_id
,
&
rrc_inst
->
configuration
,
UEcap
);
// drx_Config IE
}
else
{
LOG_E
(
RRC
,
"Invalid CC_id for DRX configuration
\n
"
);
}
...
...
@@ -3951,7 +3951,7 @@ flexran_rrc_eNB_generate_defaultRRCConnectionReconfiguration(const protocol_ctxt
/* Process the IE drx_Config */
if
(
cc_id
<
MAX_NUM_CCs
)
{
mac_MainConfig
->
drx_Config
=
do_DrxConfig
(
module_id
,
cc_id
,
&
rrc_inst
->
configuration
,
UEcap
);
// drx_Config IE
mac_MainConfig
->
drx_Config
=
do_DrxConfig
(
cc_id
,
&
rrc_inst
->
configuration
,
UEcap
);
// drx_Config IE
}
else
{
LOG_E
(
RRC
,
"Invalid CC_id for DRX configuration
\n
"
);
}
...
...
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