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
常顺宇
OpenXG-RAN
Commits
3289891e
Commit
3289891e
authored
7 years ago
by
Ahmed Elias
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update do_RRCConnectionReconfiguration_BR method
parent
707f2745
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
37 additions
and
62 deletions
+37
-62
openair2/RRC/LITE/MESSAGES/asn1_msg.c
openair2/RRC/LITE/MESSAGES/asn1_msg.c
+6
-62
openair2/RRC/LITE/MESSAGES/asn1_msg.h
openair2/RRC/LITE/MESSAGES/asn1_msg.h
+31
-0
No files found.
openair2/RRC/LITE/MESSAGES/asn1_msg.c
View file @
3289891e
...
@@ -3206,6 +3206,7 @@ do_UECapabilityEnquiry(
...
@@ -3206,6 +3206,7 @@ do_UECapabilityEnquiry(
return
((
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
}
#ifdef Rel14
uint16_t
uint16_t
do_RRCConnectionReconfiguration_BR
(
do_RRCConnectionReconfiguration_BR
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
const
protocol_ctxt_t
*
const
ctxt_pP
,
...
@@ -3262,68 +3263,10 @@ do_RRCConnectionReconfiguration_BR(
...
@@ -3262,68 +3263,10 @@ do_RRCConnectionReconfiguration_BR(
rrcConnectionReconfiguration
->
criticalExtensions
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration_r8
.
radioResourceConfigDedicated
->
cba_RNTI_vlola
=
cba_rnti
;
rrcConnectionReconfiguration
->
criticalExtensions
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration_r8
.
radioResourceConfigDedicated
->
cba_RNTI_vlola
=
cba_rnti
;
#endif
#endif
// +kogo
physicalConfigDedicated
->
cqi_ReportConfig
=
CALLOC
(
1
,
sizeof
(
struct
CQI_ReportConfig
));
physicalConfigDedicated
->
schedulingRequestConfig
->
choice
.
setup
.
dsr_TransMax
=
SchedulingRequestConfig__setup__dsr_TransMax_n4
;
physicalConfigDedicated
->
cqi_ReportConfig
->
cqi_ReportModeAperiodic
=
CALLOC
(
1
,
sizeof
(
CQI_ReportModeAperiodic_t
));
*
physicalConfigDedicated
->
cqi_ReportConfig
->
cqi_ReportModeAperiodic
=
CQI_ReportModeAperiodic_rm20
;
physicalConfigDedicated
->
ext4
->
csi_RS_ConfigNZPToReleaseList_r11
=
NULL
;
physicalConfigDedicated
->
cqi_ReportConfig
->
nomPDSCH_RS_EPRE_Offset
=
0
;
physicalConfigDedicated
->
ext4
->
csi_RS_ConfigNZPToAddModList_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
csi_RS_ConfigZPToAddModList_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
csi_RS_ConfigZPToReleaseList_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
present
=
EPDCCH_Config_r11__config_r11_PR_setup
;
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
choice
.
setup
.
subframePatternConfig_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
choice
.
setup
.
startSymbol_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
choice
.
setup
.
setConfigToReleaseList_r11
=
NULL
;
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
choice
.
setup
.
setConfigToAddModList_r11
=
calloc
(
1
,
sizeof
(
EPDCCH_SetConfigToAddModList_r11_t
));
// memset(physicalConfigDedicated2->ext4->epdcch_Config_r11->config_r11.choice.setup.setConfigToAddModList_r11, 0, sizeof())
EPDCCH_SetConfig_r11_t
*
epdcch_setconfig_r11
=
calloc
(
0
,
sizeof
(
EPDCCH_SetConfig_r11_t
));
epdcch_setconfig_r11
->
setConfigId_r11
=
0
;
epdcch_setconfig_r11
->
transmissionType_r11
=
EPDCCH_SetConfig_r11__transmissionType_r11_localised
;
epdcch_setconfig_r11
->
resourceBlockAssignment_r11
.
numberPRB_Pairs_r11
=
EPDCCH_SetConfig_r11__resourceBlockAssignment_r11__numberPRB_Pairs_r11_n2
;
//epdcch_setconfig_r11->resourceBlockAssignment_r11.resourceBlockAssignment_r11 = calloc(0, sizeof(BIT_STRING_t));
epdcch_setconfig_r11
->
resourceBlockAssignment_r11
.
resourceBlockAssignment_r11
.
buf
=
calloc
(
0
,
2
*
sizeof
(
uint8_t
));
epdcch_setconfig_r11
->
resourceBlockAssignment_r11
.
resourceBlockAssignment_r11
.
size
=
2
;
epdcch_setconfig_r11
->
resourceBlockAssignment_r11
.
resourceBlockAssignment_r11
.
bits_unused
=
6
;
epdcch_setconfig_r11
->
resourceBlockAssignment_r11
.
resourceBlockAssignment_r11
.
buf
[
0
]
=
0x0E
;
epdcch_setconfig_r11
->
dmrs_ScramblingSequenceInt_r11
=
0
;
epdcch_setconfig_r11
->
pucch_ResourceStartOffset_r11
=
0
;
epdcch_setconfig_r11
->
re_MappingQCL_ConfigId_r11
=
NULL
;
epdcch_setconfig_r11
->
ext2
->
numberPRB_Pairs_v1310
=
NULL
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
present
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13_PR_setup
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
csi_NumRepetitionCE_r13
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13__setup__csi_NumRepetitionCE_r13_sf1
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
mpdcch_pdsch_HoppingConfig_r13
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13__setup__mpdcch_pdsch_HoppingConfig_r13_off
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
mpdcch_StartSF_UESS_r13
.
present
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13__setup__mpdcch_StartSF_UESS_r13_PR_fdd_r13
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
mpdcch_StartSF_UESS_r13
.
choice
.
fdd_r13
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13__setup__mpdcch_StartSF_UESS_r13__fdd_r13_v1
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
mpdcch_NumRepetition_r13
=
EPDCCH_SetConfig_r11__ext2__mpdcch_config_r13__setup__mpdcch_NumRepetition_r13_r1
;
epdcch_setconfig_r11
->
ext2
->
mpdcch_config_r13
->
choice
.
setup
.
mpdcch_Narrowband_r13
=
3
;
ASN_SEQUENCE_ADD
(
physicalConfigDedicated
->
ext4
->
epdcch_Config_r11
->
config_r11
.
choice
.
setup
.
setConfigToAddModList_r11
,
epdcch_setconfig_r11
);
physicalConfigDedicated
->
ext7
->
pdsch_ConfigDedicated_v1310
=
NULL
;
physicalConfigDedicated
->
ext7
->
pusch_ConfigDedicated_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
pdcch_CandidateReductions_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
pucch_ConfigDedicated_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
cqi_ReportConfig_v1310
=
NULL
;
physicalConfigDedicated
->
ext7
->
soundingRS_UL_ConfigDedicated_v1310
=
NULL
;
physicalConfigDedicated
->
ext7
->
soundingRS_UL_ConfigDedicatedUpPTsExt_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
soundingRS_UL_ConfigDedicatedAperiodic_v1310
=
NULL
;
physicalConfigDedicated
->
ext7
->
soundingRS_UL_ConfigDedicatedAperiodicUpPTsExt_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
csi_RS_Config_v1310
=
NULL
;
physicalConfigDedicated
->
ext7
->
ce_Mode_r13
->
present
=
PhysicalConfigDedicated__ext7__ce_Mode_r13_PR_setup
;
physicalConfigDedicated
->
ext7
->
ce_Mode_r13
->
choice
.
setup
=
PhysicalConfigDedicated__ext7__ce_Mode_r13__setup_ce_ModeA
;
physicalConfigDedicated
->
ext7
->
csi_RS_ConfigNZPToAddModListExt_r13
=
NULL
;
physicalConfigDedicated
->
ext7
->
csi_RS_ConfigNZPToReleaseListExt_r13
=
NULL
;
// +kogo ------------------------------------------------------------------------------------------
if
(
mac_MainConfig
!=
NULL
)
{
if
(
mac_MainConfig
!=
NULL
)
{
rrcConnectionReconfiguration
->
criticalExtensions
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration_r8
.
radioResourceConfigDedicated
->
mac_MainConfig
=
CALLOC
(
1
,
rrcConnectionReconfiguration
->
criticalExtensions
.
choice
.
c1
.
choice
.
rrcConnectionReconfiguration_r8
.
radioResourceConfigDedicated
->
mac_MainConfig
=
CALLOC
(
1
,
...
@@ -3424,6 +3367,7 @@ do_RRCConnectionReconfiguration_BR(
...
@@ -3424,6 +3367,7 @@ do_RRCConnectionReconfiguration_BR(
return
((
enc_rval
.
encoded
+
7
)
/
8
);
return
((
enc_rval
.
encoded
+
7
)
/
8
);
}
}
#endif
//------------------------------------------------------------------------------
//------------------------------------------------------------------------------
uint16_t
uint16_t
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LITE/MESSAGES/asn1_msg.h
View file @
3289891e
...
@@ -176,6 +176,37 @@ do_RRCConnectionSetup_BR(
...
@@ -176,6 +176,37 @@ do_RRCConnectionSetup_BR(
);
);
#endif
#endif
#ifdef Rel14
uint16_t
do_RRCConnectionReconfiguration_BR
(
const
protocol_ctxt_t
*
const
ctxt_pP
,
uint8_t
*
buffer
,
uint8_t
Transaction_id
,
SRB_ToAddModList_t
*
SRB_list
,
DRB_ToAddModList_t
*
DRB_list
,
DRB_ToReleaseList_t
*
DRB_list2
,
struct
SPS_Config
*
sps_Config
,
struct
PhysicalConfigDedicated
*
physicalConfigDedicated
,
MeasObjectToAddModList_t
*
MeasObj_list
,
ReportConfigToAddModList_t
*
ReportConfig_list
,
QuantityConfig_t
*
quantityConfig
,
MeasIdToAddModList_t
*
MeasId_list
,
MAC_MainConfig_t
*
mac_MainConfig
,
MeasGapConfig_t
*
measGapConfig
,
MobilityControlInfo_t
*
mobilityInfo
,
struct
MeasConfig__speedStatePars
*
speedStatePars
,
RSRP_Range_t
*
rsrp
,
C_RNTI_t
*
cba_rnti
,
struct
RRCConnectionReconfiguration_r8_IEs__dedicatedInfoNASList
*
dedicatedInfoNASList
#if defined(Rel10) || defined(Rel14)
,
SCellToAddMod_r10_t
*
SCell_config
#endif
);
#endif
/**
/**
\brief Generate an RRCConnectionReconfiguration DL-DCCH-Message (eNB). This routine configures SRBToAddMod (SRB2) and one DRBToAddMod
\brief Generate an RRCConnectionReconfiguration DL-DCCH-Message (eNB). This routine configures SRBToAddMod (SRB2) and one DRBToAddMod
(DRB3). PhysicalConfigDedicated is not updated.
(DRB3). PhysicalConfigDedicated is not updated.
...
...
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