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
lizhongxiao
OpenXG-RAN
Commits
e53bac96
Commit
e53bac96
authored
Apr 16, 2018
by
Tien-Thinh Nguyen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove debug messages
parent
bc5781aa
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
34 deletions
+25
-34
openair2/LAYER2/MAC/config.c
openair2/LAYER2/MAC/config.c
+22
-24
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+3
-10
No files found.
openair2/LAYER2/MAC/config.c
View file @
e53bac96
...
...
@@ -1403,7 +1403,7 @@ rrc_mac_config_req_ue(
}
for
(
k
=
0
;
k
<
MAX_NUM_LCID_DATA
;
k
++
)
{
LOG_
I
(
MAC
,
"[UE %d] logical channel %d channel id %d, groupL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
LOG_
D
(
MAC
,
"[UE %d] logical channel %d channel id %d, groupL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
}
}
if
(
destinationL2Id
){
...
...
@@ -1422,11 +1422,10 @@ rrc_mac_config_req_ue(
}
for
(
k
=
0
;
k
<
MAX_NUM_LCID_DATA
;
k
++
)
{
LOG_
I
(
MAC
,
"[UE %d] logical channel %d channel id %d, destinationL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
);
LOG_
D
(
MAC
,
"[UE %d] logical channel %d channel id %d, destinationL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
);
}
}
}
else
if
((
logicalChannelIdentity
>=
MAX_NUM_LCID_DATA
)
&&
(
logicalChannelIdentity
<
MAX_NUM_LCID
))
{
// if (destinationL2Id){
LOG_I
(
MAC
,
"[UE %d] Configure LCID %d for PC5S
\n
"
,
Mod_idP
,
logicalChannelIdentity
);
j
=
0
;
k
=
0
;
...
...
@@ -1443,9 +1442,8 @@ rrc_mac_config_req_ue(
}
for
(
k
=
MAX_NUM_LCID_DATA
;
k
<
MAX_NUM_LCID
;
k
++
)
{
LOG_I
(
MAC
,
"[UE %d] logical channel %d channel id %d, destinationL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
);
LOG_D
(
MAC
,
"[UE %d] logical channel %d channel id %d, destinationL2Id %d
\n
"
,
Mod_idP
,
k
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
);
}
// }
}
...
...
@@ -1466,10 +1464,10 @@ rrc_mac_config_req_ue(
}
for
(
k
=
0
;
k
<
MAX_NUM_LCID_DATA
;
k
++
)
{
LOG_
I
(
MAC
,
"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d
\n
"
,
Mod_idP
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
LOG_
D
(
MAC
,
"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d
\n
"
,
Mod_idP
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
}
}
else
if
((
logicalChannelIdentity
>=
MAX_NUM_LCID_DATA
)
&&
(
logicalChannelIdentity
<
MAX_NUM_LCID
))
{
//
Todo -
remove RBID for PCS5
//remove RBID for PCS5
LOG_I
(
MAC
,
"[UE %d] Remove (logicalChannelIdentity %d)
\n
"
,
Mod_idP
,
logicalChannelIdentity
);
k
=
0
;
for
(
k
=
MAX_NUM_LCID_DATA
;
k
<
MAX_NUM_LCID
;
k
++
)
{
...
...
@@ -1483,7 +1481,7 @@ rrc_mac_config_req_ue(
}
for
(
k
=
MAX_NUM_LCID_DATA
;
k
<
MAX_NUM_LCID
;
k
++
)
{
LOG_
I
(
MAC
,
"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d
\n
"
,
Mod_idP
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
LOG_
D
(
MAC
,
"[UE %d] channel id %d, destinationL2Id %d, groupL2Id %d
\n
"
,
Mod_idP
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
LCID
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
destinationL2Id
,
UE_mac_inst
[
Mod_idP
].
sl_info
[
k
].
groupL2Id
);
}
}
...
...
openair2/LAYER2/MAC/ue_procedures.c
View file @
e53bac96
...
...
@@ -794,13 +794,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
break
;
}
}
// if (UE_mac_inst[module_idP].sl_info[i].groupL2Id == destinationL2Id) break;
}
/*
int j = 0;
for (j=0; j< MAX_NUM_LCID; j++)
if (UE_mac_inst[module_idP].sl_info[j].destinationL2Id == sourceL2Id) break;
*/
//match the destinationL2Id with UE L2Id or groupL2ID
if
(
!
(((
destinationL2Id
==
UE_mac_inst
[
module_idP
].
sourceL2Id
)
&&
(
j
<
MAX_NUM_LCID
))
|
((
destinationL2Id
==
UE_mac_inst
[
module_idP
].
sourceL2Id
)
&&
(
longh
->
LCID
>=
MAX_NUM_LCID_DATA
))
|
(
i
<
MAX_NUM_LCID
))){
...
...
@@ -808,8 +802,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
return
;
}
LOG_I
(
MAC
,
"[longh->LCID %d]
\n
"
,
longh
->
LCID
);
LOG_I
(
MAC
,
"[DestinationL2Id: 0x%08x, sl_rbid %d]
\n
"
,
destinationL2Id
,
lcid
);
LOG_D
(
MAC
,
"DestinationL2Id: 0x%08x, sl_rbid %d, longh->LCID %d
\n
"
,
destinationL2Id
,
lcid
,
longh
->
LCID
);
if
(
longh
->
F
==
1
)
{
...
...
@@ -834,7 +827,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
NULL
);
}
else
{
//SL_DISCOVERY
uint16_t
len
=
sdu_len
;
LOG_
I
(
MAC
,
"SL DISCOVERY
\n
"
);
LOG_
D
(
MAC
,
"SL DISCOVERY
\n
"
);
mac_rrc_data_ind
(
module_idP
,
CC_id
,
frameP
,
subframeP
,
...
...
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