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
spbro
OpenXG-RAN
Commits
cae1ed0b
Commit
cae1ed0b
authored
Jan 15, 2019
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changed some AssertFatal into LOG_E + return(-1)
parent
38fa4523
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
3 deletions
+13
-3
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+13
-3
No files found.
openair2/LAYER2/MAC/config.c
View file @
cae1ed0b
...
@@ -892,11 +892,15 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -892,11 +892,15 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
}
}
}
// mib != NULL
}
// mib != NULL
// SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
// SRB2_lchan_config->choice.explicitValue.ul_SpecificParameters->logicalChannelGroup
if
(
logicalChannelConfig
!=
NULL
)
{
// check for eMTC specific things
if
(
logicalChannelConfig
!=
NULL
)
{
// check for eMTC specific things
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
AssertFatal
(
UE_id
>=
0
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
if
(
UE_id
<
0
)
{
LOG_E
(
MAC
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
return
(
-
1
);
}
if
(
logicalChannelConfig
)
{
if
(
logicalChannelConfig
)
{
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
logicalChannelIdentity
]
=
*
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
;
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidmap
[
logicalChannelIdentity
]
=
*
logicalChannelConfig
->
ul_SpecificParameters
->
logicalChannelGroup
;
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidpriority
[
logicalChannelIdentity
]
=
logicalChannelConfig
->
ul_SpecificParameters
->
priority
;
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
lcgidpriority
[
logicalChannelIdentity
]
=
logicalChannelConfig
->
ul_SpecificParameters
->
priority
;
...
@@ -905,7 +909,10 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -905,7 +909,10 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
if
(
physicalConfigDedicated
!=
NULL
)
{
if
(
physicalConfigDedicated
!=
NULL
)
{
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
AssertFatal
(
UE_id
>=
0
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
if
(
UE_id
<
0
)
{
LOG_E
(
MAC
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
return
(
-
1
);
}
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
=
physicalConfigDedicated
;
UE_list
->
UE_template
[
CC_idP
][
UE_id
].
physicalConfigDedicated
=
physicalConfigDedicated
;
LOG_I
(
MAC
,
"Added physicalConfigDedicated %p for %d.%d
\n
"
,
physicalConfigDedicated
,
CC_idP
,
UE_id
);
LOG_I
(
MAC
,
"Added physicalConfigDedicated %p for %d.%d
\n
"
,
physicalConfigDedicated
,
CC_idP
,
UE_id
);
}
}
...
@@ -914,7 +921,10 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
...
@@ -914,7 +921,10 @@ int rrc_mac_config_req_eNB(module_id_t Mod_idP,
#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
#if (LTE_RRC_VERSION >= MAKE_VERSION(10, 0, 0))
if
(
sCellToAddMod_r10
!=
NULL
)
{
if
(
sCellToAddMod_r10
!=
NULL
)
{
UE_id
=
find_UE_id
(
Mod_idP
,
rntiP
);
if
(
UE_id
<
0
)
{
LOG_E
(
MAC
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
return
(
-
1
);
}
AssertFatal
(
UE_id
>=
0
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
AssertFatal
(
UE_id
>=
0
,
"Configuration received for unknown UE (%x), shouldn't happen
\n
"
,
rntiP
);
config_dedicated_scell
(
Mod_idP
,
rntiP
,
sCellToAddMod_r10
);
config_dedicated_scell
(
Mod_idP
,
rntiP
,
sCellToAddMod_r10
);
}
}
...
...
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