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
699ba2a9
Commit
699ba2a9
authored
Jul 26, 2017
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small change in init_SI routine in rrc_eNB.c after merge
parent
6a77ce4e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
15 deletions
+16
-15
openair2/RRC/LITE/rrc_eNB.c
openair2/RRC/LITE/rrc_eNB.c
+16
-15
No files found.
openair2/RRC/LITE/rrc_eNB.c
View file @
699ba2a9
...
...
@@ -168,11 +168,11 @@ init_SI(
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1
!=
NULL
,
PROTOCOL_RRC_CTXT_FMT
" init_SI: FATAL, no memory for SIB1 allocated
\n
"
,
PROTOCOL_RRC_CTXT_ARGS
(
ctxt_pP
));
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
#ifdef Rel14
,
FALSE
#endif
#if defined(ENABLE_ITTI)
,
configuration
#endif
#ifdef Rel14
,
0
#endif
);
...
...
@@ -180,31 +180,35 @@ init_SI(
#ifdef Rel14
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
0
;
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB1_BR
=
(
uint8_t
*
)
malloc16
(
32
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB1_BR
=
do_SIB1
(
&
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
],
ctxt_pP
->
module_id
,
CC_id
,
TRUE
#if defined(ENABLE_ITTI)
,
configuration
,
configuration
#endif
,
1
);
);
}
#endif
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
=
(
uint8_t
*
)
malloc16
(
64
);
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23
!=
NULL
,
"cannot allocate memory for SIB"
);
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23
=
do_SIB23
(
ctxt_pP
->
module_id
,
CC_id
#ifdef Rel14
,
FALSE
#endif
#if defined(ENABLE_ITTI)
,
configuration
#endif
#ifdef Rel14
,
0
#endif
);
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23
!=
255
,
"FATAL, RC.rrc[mod].carrier[CC_id].sizeof_SIB23 == 255"
);
#ifdef Rel14
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23_BR
=
0
;
if
(
configuration
->
schedulingInfoSIB1_BR_r13
[
CC_id
]
>
0
)
{
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23_BR
=
(
uint8_t
*
)
malloc16
(
64
);
AssertFatal
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
SIB23_BR
!=
NULL
,
"cannot allocate memory for SIB"
);
...
...
@@ -216,9 +220,6 @@ init_SI(
#endif
0
);
}
else
{
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
sizeof_SIB23_BR
=
0
;
}
#endif
LOG_T
(
RRC
,
PROTOCOL_RRC_CTXT_FMT
" SIB2/3 Contents (partial)
\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