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
ff1bca51
Commit
ff1bca51
authored
Jul 14, 2018
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
loggin removal
parent
046d12fe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
12 deletions
+19
-12
openair2/LAYER2/MAC/ue_procedures.c
openair2/LAYER2/MAC/ue_procedures.c
+9
-4
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
+6
-4
openair2/LAYER2/RLC/rlc_mac.c
openair2/LAYER2/RLC/rlc_mac.c
+2
-2
openair2/NETWORK_DRIVER/UE_IP/common.c
openair2/NETWORK_DRIVER/UE_IP/common.c
+1
-1
targets/RT/USER/lte-uesoftmodem.c
targets/RT/USER/lte-uesoftmodem.c
+1
-1
No files found.
openair2/LAYER2/MAC/ue_procedures.c
View file @
ff1bca51
...
...
@@ -879,6 +879,7 @@ void ue_send_sl_sdu(module_id_t module_idP,
}
}
}
/*
int k = 0;
if (j == MAX_NUM_LCID) {
...
...
@@ -892,7 +893,6 @@ void ue_send_sl_sdu(module_id_t module_idP,
}
}
*/
//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))){
...
...
@@ -905,7 +905,10 @@ void ue_send_sl_sdu(module_id_t module_idP,
return;
}
LOG_I
(
MAC
,
"DestinationL2Id: 0x%08x, sl_rbid %d, longh->LCID %d
\n
"
,
destinationL2Id
,
lcid
,
longh
->
LCID
);
*/
lcid
=
longh
->
LCID
;
// LOG_I( MAC, "DestinationL2Id: 0x%08x, sl_rbid %d, longh->LCID %d \n", destinationL2Id, lcid, longh->LCID );
if
(
longh
->
F
==
1
)
{
...
...
@@ -930,11 +933,13 @@ void ue_send_sl_sdu(module_id_t module_idP,
}
}
if
(
reset_flag
==
SL_RESET_RLC_FLAG_YES
){
LOG_
I
(
MAC
,
"SL_RESET_RLC_FLAG_YES
\n
"
);
LOG_
D
(
MAC
,
"SL_RESET_RLC_FLAG_YES
\n
"
);
}
else
{
LOG_
I
(
MAC
,
"SL_RESET_RLC_FLAG_NO
\n
"
);
LOG_
D
(
MAC
,
"SL_RESET_RLC_FLAG_NO
\n
"
);
}
LOG_I
(
MAC
,
"sending sdu of size %d, lcid %d to RLC
\n
"
,
rlc_sdu_len
,
lcid
);
mac_rlc_data_ind
(
module_idP
,
0x1234
,
...
...
openair2/LAYER2/RLC/UM_v9.3.0/rlc_um.c
View file @
ff1bca51
...
...
@@ -205,7 +205,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind
// establishment, the RLC entity:
// - is created; and
// - enters the DATA_TRANSFER_READY state.
LOG_
N
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" ERROR MAC_DATA_IND IN RLC_NULL_STATE
\n
"
,
LOG_
W
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" ERROR MAC_DATA_IND IN RLC_NULL_STATE
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
l_rlc_p
));
#if MESSAGE_CHART_GENERATOR
...
...
@@ -268,7 +268,7 @@ rlc_um_rx (const protocol_ctxt_t* const ctxt_pP, void *argP, struct mac_data_ind
#if TRACE_RLC_UM_PDU || MESSAGE_CHART_GENERATOR
if
(
data_indP
.
data
.
nb_elements
>
0
)
{
LOG_
D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" MAC_DATA_IND %d TBs
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" MAC_DATA_IND %d TBs
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
l_rlc_p
),
data_indP
.
data
.
nb_elements
);
...
...
@@ -749,7 +749,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
char
message_string
[
7000
];
#endif
LOG_
D
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" RLC_UM_DATA_REQ size %d Bytes, BO %d , NB SDU %d
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_RLC_UM_CTXT_FMT
" RLC_UM_DATA_REQ size %d Bytes, BO %d , NB SDU %d
\n
"
,
PROTOCOL_RLC_UM_CTXT_ARGS
(
ctxt_pP
,
rlc_p
),
((
struct
rlc_um_data_req
*
)
(
sdu_pP
->
data
))
->
data_size
,
rlc_p
->
buffer_occupancy
,
...
...
@@ -821,7 +821,7 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
}
message_string_size
+=
sprintf
(
&
message_string
[
message_string_size
],
" |
\n
"
);
/*
# if ENABLE_ITTI
msg_p = itti_alloc_new_message_sized (ctxt_pP->enb_flag > 0 ? TASK_RLC_ENB:TASK_RLC_UE , RLC_UM_SDU_REQ, message_string_size + sizeof (IttiMsgText));
msg_p->ittiMsg.rlc_um_sdu_req.size = message_string_size;
...
...
@@ -831,6 +831,8 @@ rlc_um_data_req (const protocol_ctxt_t* const ctxt_pP, void *rlc_pP, mem_block_t
#else
LOG_T(RLC, "%s", message_string);
#endif
*/
LOG_I
(
RLC
,
"%s"
,
message_string
);
# endif
RLC_UM_MUTEX_LOCK
(
&
rlc_p
->
lock_input_sdus
,
ctxt_pP
,
rlc_p
);
rlc_p
->
buffer_occupancy
+=
((
struct
rlc_um_tx_sdu_management
*
)
(
sdu_pP
->
data
))
->
sdu_size
;
...
...
openair2/LAYER2/RLC/rlc_mac.c
View file @
ff1bca51
...
...
@@ -37,7 +37,7 @@
#include "assertions.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
//
#define DEBUG_MAC_INTERFACE 1
#define DEBUG_MAC_INTERFACE 1
//-----------------------------------------------------------------------------
struct
mac_data_ind
mac_rlc_deserialize_tb
(
...
...
@@ -253,7 +253,7 @@ void mac_rlc_data_ind (
#ifdef DEBUG_MAC_INTERFACE
if
(
num_tbP
)
{
LOG_
D
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d
\n
"
,
LOG_
I
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, Num_tb %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
channel_idP
,
RLC_MAX_LC
,
...
...
openair2/NETWORK_DRIVER/UE_IP/common.c
View file @
ff1bca51
...
...
@@ -57,7 +57,7 @@
ntohs((addr)->s6_addr16[7])
#define OAI_DRV_DEBUG_SEND
//
#define OAI_DRV_DEBUG_SEND
//#define OAI_DRV_DEBUG_RECEIVE
void
...
...
targets/RT/USER/lte-uesoftmodem.c
View file @
ff1bca51
...
...
@@ -807,7 +807,7 @@ int main( int argc, char **argv )
set_comp_log
(
HW
,
LOG_DEBUG
,
LOG_HIGH
,
1
);
set_comp_log
(
PHY
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
MAC
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
RLC
,
LOG_INFO
,
LOG_HIGH
|
FLAG_THREAD
,
1
);
set_comp_log
(
RLC
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
PDCP
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
OTG
,
LOG_INFO
,
LOG_HIGH
,
1
);
set_comp_log
(
RRC
,
LOG_INFO
,
LOG_HIGH
,
1
);
...
...
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