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
7c770135
Commit
7c770135
authored
Jun 27, 2018
by
WEI-TAI CHEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Complete solve the Segmentation Fault on do_SERVINGCELLCONFIGCOMMON
parent
f701c02f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
9 deletions
+3
-9
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
+3
-9
No files found.
openair2/RRC/NR/MESSAGES/asn1_msg.c
View file @
7c770135
...
@@ -288,15 +288,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
...
@@ -288,15 +288,11 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
{
{
NR_ServingCellConfigCommon_t
**
servingcellconfigcommon
=
&
RC
.
nrrrc
[
Mod_id
]
->
carrier
[
CC_id
].
servingcellconfigcommon
;
NR_ServingCellConfigCommon_t
**
servingcellconfigcommon
=
&
RC
.
nrrrc
[
Mod_id
]
->
carrier
[
CC_id
].
servingcellconfigcommon
;
if
(
!
servingcellconfigcommon
)
{
(
*
servingcellconfigcommon
)
=
CALLOC
(
1
,
sizeof
(
NR_ServingCellConfigCommon_t
));
LOG_E
(
NR_RRC
,
"[gNB %d] servingcellconfigcommon is null, exiting
\n
"
,
Mod_id
);
exit
(
-
1
);
}
(
*
servingcellconfigcommon
)
->
physCellId
=
CALLOC
(
1
,
sizeof
(
NR_PhysCellId_t
));
(
*
servingcellconfigcommon
)
->
physCellId
=
CALLOC
(
1
,
sizeof
(
NR_PhysCellId_t
));
(
*
servingcellconfigcommon
)
->
frequencyInfoDL
=
CALLOC
(
1
,
sizeof
(
struct
NR_FrequencyInfoDL
));
(
*
servingcellconfigcommon
)
->
frequencyInfoDL
=
CALLOC
(
1
,
sizeof
(
struct
NR_FrequencyInfoDL
));
(
*
servingcellconfigcommon
)
->
initialDownlinkBWP
=
CALLOC
(
1
,
sizeof
(
struct
NR_BWP_DownlinkCommon
));
(
*
servingcellconfigcommon
)
->
initialDownlinkBWP
=
CALLOC
(
1
,
sizeof
(
struct
NR_BWP_DownlinkCommon
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
=
CALLOC
(
1
,
sizeof
(
struct
NR_UplinkConfigCommon
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
=
CALLOC
(
1
,
sizeof
(
struct
NR_UplinkConfigCommon
_t
));
//(*servingcellconfigcommon)->supplementaryUplinkConfig = CALLOC(1,sizeof(struct NR_UplinkConfigCommon));
//(*servingcellconfigcommon)->supplementaryUplinkConfig = CALLOC(1,sizeof(struct NR_UplinkConfigCommon));
(
*
servingcellconfigcommon
)
->
ssb_PositionsInBurst
=
CALLOC
(
1
,
sizeof
(
struct
NR_ServingCellConfigCommon__ssb_PositionsInBurst
));
(
*
servingcellconfigcommon
)
->
ssb_PositionsInBurst
=
CALLOC
(
1
,
sizeof
(
struct
NR_ServingCellConfigCommon__ssb_PositionsInBurst
));
(
*
servingcellconfigcommon
)
->
ssb_periodicityServingCell
=
CALLOC
(
1
,
sizeof
(
long
));
(
*
servingcellconfigcommon
)
->
ssb_periodicityServingCell
=
CALLOC
(
1
,
sizeof
(
long
));
...
@@ -382,7 +378,6 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
...
@@ -382,7 +378,6 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
bwp_dl_controlresourceset
->
tci_StatesPDCCH
=
CALLOC
(
1
,
sizeof
(
struct
NR_ControlResourceSet__tci_StatesPDCCH
));
bwp_dl_controlresourceset
->
tci_StatesPDCCH
=
CALLOC
(
1
,
sizeof
(
struct
NR_ControlResourceSet__tci_StatesPDCCH
));
NR_TCI_StateId_t
*
TCI_StateId
;
NR_TCI_StateId_t
*
TCI_StateId
;
TCI_StateId
=
CALLOC
(
1
,
sizeof
(
NR_TCI_StateId_t
));
TCI_StateId
=
CALLOC
(
1
,
sizeof
(
NR_TCI_StateId_t
));
memset
(
&
TCI_StateId
,
0
,
sizeof
(
NR_TCI_StateId_t
));
*
(
TCI_StateId
)
=
configuration
->
PDCCH_TCI_StateId
[
CC_id
];
*
(
TCI_StateId
)
=
configuration
->
PDCCH_TCI_StateId
[
CC_id
];
ASN_SEQUENCE_ADD
(
&
bwp_dl_controlresourceset
->
tci_StatesPDCCH
->
list
,
&
TCI_StateId
);
ASN_SEQUENCE_ADD
(
&
bwp_dl_controlresourceset
->
tci_StatesPDCCH
->
list
,
&
TCI_StateId
);
...
@@ -537,6 +532,7 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
...
@@ -537,6 +532,7 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
//uplinkConfigCommon initialUplinkBWP //
//uplinkConfigCommon initialUplinkBWP //
//Fill initialUplinkBWP -> BWP-UplinkCommon -> genericParameters//
//Fill initialUplinkBWP -> BWP-UplinkCommon -> genericParameters//
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
=
CALLOC
(
1
,
sizeof
(
struct
NR_BWP_UplinkCommon
));
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
=
configuration
->
UL_locationAndBandwidth
[
CC_id
];
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
locationAndBandwidth
=
configuration
->
UL_locationAndBandwidth
[
CC_id
];
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
subcarrierSpacing
=
configuration
->
UL_BWP_SubcarrierSpacing
[
CC_id
];
(
*
servingcellconfigcommon
)
->
uplinkConfigCommon
->
initialUplinkBWP
->
genericParameters
.
subcarrierSpacing
=
configuration
->
UL_BWP_SubcarrierSpacing
[
CC_id
];
...
@@ -710,8 +706,6 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
...
@@ -710,8 +706,6 @@ void do_SERVINGCELLCONFIGCOMMON(uint8_t Mod_id,
if
(
ratematchpattern
->
patternType
.
present
==
NR_RateMatchPattern__patternType_PR_bitmaps
){
if
(
ratematchpattern
->
patternType
.
present
==
NR_RateMatchPattern__patternType_PR_bitmaps
){
ratematchpattern
->
patternType
.
choice
.
bitmaps
=
CALLOC
(
1
,
sizeof
(
struct
NR_RateMatchPattern__patternType__bitmaps
));
ratematchpattern
->
patternType
.
choice
.
bitmaps
=
CALLOC
(
1
,
sizeof
(
struct
NR_RateMatchPattern__patternType__bitmaps
));
memset
(
&
ratematchpattern
->
patternType
.
choice
.
bitmaps
,
0
,
sizeof
(
struct
NR_RateMatchPattern__patternType__bitmaps
));
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
buf
=
MALLOC
(
35
);
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
buf
=
MALLOC
(
35
);
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
size
=
35
;
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
size
=
35
;
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
bits_unused
=
5
;
ratematchpattern
->
patternType
.
choice
.
bitmaps
->
resourceBlocks
.
bits_unused
=
5
;
...
...
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