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
ddb238b8
Commit
ddb238b8
authored
6 years ago
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of logging
preparation for UE CONTEXT Release from CU
parent
6bbc8169
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
65 additions
and
49 deletions
+65
-49
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+1
-1
openair2/F1AP/f1ap_du_rrc_message_transfer.c
openair2/F1AP/f1ap_du_rrc_message_transfer.c
+2
-1
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+1
-1
openair2/LAYER2/RLC/rlc.c
openair2/LAYER2/RLC/rlc.c
+3
-3
openair2/LAYER2/RLC/rlc_mac.c
openair2/LAYER2/RLC/rlc_mac.c
+2
-2
openair2/RRC/LTE/rrc_eNB.c
openair2/RRC/LTE/rrc_eNB.c
+56
-41
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
ddb238b8
...
...
@@ -1843,7 +1843,7 @@ void fill_uci_harq_indication(PHY_VARS_eNB *eNB,
pdu
->
ul_cqi_information
.
tl
.
tag
=
NFAPI_UL_CQI_INFORMATION_TAG
;
int
SNRtimes10
=
dB_fixed_times10
(
uci
->
stat
)
-
300
;
//(10*eNB->measurements.n0_power_dB[0]);
if
(
SNRtimes10
<
-
100
)
LOG_
I
(
PHY
,
"uci->stat %d
\n
"
,
uci
->
stat
);
if
(
SNRtimes10
<
-
100
)
LOG_
D
(
PHY
,
"uci->stat %d
\n
"
,
uci
->
stat
);
if
(
SNRtimes10
<
-
640
)
pdu
->
ul_cqi_information
.
ul_cqi
=
0
;
else
if
(
SNRtimes10
>
635
)
pdu
->
ul_cqi_information
.
ul_cqi
=
255
;
...
...
This diff is collapsed.
Click to expand it.
openair2/F1AP/f1ap_du_rrc_message_transfer.c
View file @
ddb238b8
...
...
@@ -482,12 +482,13 @@ int DU_handle_DL_RRC_MESSAGE_TRANSFER(instance_t instance,
break
;
case
DL_DCCH_MessageType__c1_PR_rrcConnectionRelease
:
// handle RRCConnectionRelease
LOG_I
(
DU_F1AP
,
"Received RRCConnectionRelease
\n
"
);
break
;
case
DL_DCCH_MessageType__c1_PR_securityModeCommand
:
LOG_I
(
DU_F1AP
,
"Received securityModeCommand
\n
"
);
break
;
case
DL_DCCH_MessageType__c1_PR_ueCapabilityEnquiry
:
LOG_I
(
DU_F1AP
,
"Received
s
ueCapabilityEnquiry
\n
"
);
LOG_I
(
DU_F1AP
,
"Received ueCapabilityEnquiry
\n
"
);
break
;
case
DL_DCCH_MessageType__c1_PR_counterCheck
:
#if (RRC_VERSION >= MAKE_VERSION(10, 0, 0))
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
ddb238b8
...
...
@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP,
//UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer += UE_list->UE_template[CC_idP][UE_id].estimated_ul_buffer / 4;
}
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"[eNB %d] CC_id %d Frame %d : ULSCH -> UL-DCCH, received %d bytes form UE %d on LCID %d
\n
"
,
enb_mod_idP
,
CC_idP
,
frameP
,
rx_lengths
[
i
],
UE_id
,
rx_lcids
[
i
]);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/rlc.c
View file @
ddb238b8
...
...
@@ -604,15 +604,15 @@ void rlc_data_ind (
//-----------------------------------------------------------------------------
//
#if defined(TRACE_RLC_PAYLOAD)
LOG_
I
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %u] Display of rlc_data_ind: size %u
\n
"
,
#if defined(TRACE_RLC_PAYLOAD)
LOG_
D
(
RLC
,
PROTOCOL_CTXT_FMT
"[%s %u] Display of rlc_data_ind: size %u
\n
"
,
PROTOCOL_CTXT_ARGS
(
ctxt_pP
),
(
srb_flagP
)
?
"SRB"
:
"DRB"
,
rb_idP
,
sdu_sizeP
);
// rlc_util_print_hex_octets(RLC, (unsigned char*)sdu_pP->data, sdu_sizeP);
//
#endif
#endif
#if T_TRACER
if
(
ctxt_pP
->
enb_flag
)
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/RLC/rlc_mac.c
View file @
ddb238b8
...
...
@@ -38,7 +38,7 @@
#include "assertions.h"
#include "common/utils/LOG/vcd_signal_dumper.h"
#define DEBUG_MAC_INTERFACE 1
//
#define DEBUG_MAC_INTERFACE 1
//-----------------------------------------------------------------------------
struct
mac_data_ind
mac_rlc_deserialize_tb
(
...
...
@@ -260,7 +260,7 @@ void mac_rlc_data_ind (
#ifdef DEBUG_MAC_INTERFACE
if
(
num_tbP
)
{
LOG_
I
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, tb_sizeP %d
\n
"
,
LOG_
D
(
RLC
,
PROTOCOL_CTXT_FMT
" MAC_RLC_DATA_IND on channel %d (%d), rb max %d, tb_sizeP %d
\n
"
,
PROTOCOL_CTXT_ARGS
(
&
ctxt
),
channel_idP
,
RLC_MAX_LC
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/LTE/rrc_eNB.c
View file @
ddb238b8
...
...
@@ -1063,8 +1063,14 @@ void release_UE_in_freeList(module_id_t mod_id)
}
}
}
if
(
RC
.
rrc
[
mod_id
]
->
node_type
==
ngran_eNB
)
{
rrc_mac_remove_ue
(
mod_id
,
rnti
);
rrc_rlc_remove_ue
(
&
ctxt
);
}
else
if
(
RC
.
rrc
[
mod_id
]
->
node_type
==
ngran_eNB_CU
||
RC
.
rrc
[
mod_id
]
->
node_type
==
ngran_ng_eNB_CU
)
{
// send UE_CONTEXT_RELEASE
AssertFatal
(
1
==
0
,
"Need to added context removal
\n
"
);
}
pdcp_remove_UE
(
&
ctxt
);
if
(
remove_UEContext
){
...
...
@@ -6571,7 +6577,13 @@ rrc_eNB_decode_ccch(
LOG_I
(
RRC
,
PROTOCOL_RRC_CTXT_UE_FMT
" Can't create new context for UE random UE identity (0x%"
PRIx64
")
\n
"
,
PROTOCOL_RRC_CTXT_UE_ARGS
(
ctxt_pP
),
random_value
);
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
==
ngran_eNB
)
rrc_mac_remove_ue
(
ctxt_pP
->
module_id
,
ctxt_pP
->
rnti
);
else
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_eNB_CU
||
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
==
ngran_ng_eNB_CU
)
AssertFatal
(
1
==
0
,
"Need to added context removal
\n
"
);
return
-
1
;
}
}
...
...
@@ -8107,6 +8119,7 @@ rrc_rx_tx(
// ue_context_p->ue_context.ue_release_timer_s1 = 0;
#if defined(ENABLE_USE_MME)
#if defined(ENABLE_ITTI)
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
!=
ngran_eNB_DU
)
rrc_eNB_generate_RRCConnectionRelease
(
ctxt_pP
,
ue_context_p
);
#endif
#else
...
...
@@ -8141,6 +8154,7 @@ rrc_rx_tx(
ue_context_p
->
ue_context
.
ue_release_timer_thres_rrc
=
100
;
#if defined(ENABLE_USE_MME)
#if defined(ENABLE_ITTI)
if
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
!=
ngran_eNB_DU
)
{
int
e_rab
;
MessageDef
*
msg_complete_p
=
NULL
;
MessageDef
*
msg_delete_tunnels_p
=
NULL
;
...
...
@@ -8180,6 +8194,7 @@ rrc_rx_tx(
RC
.
rrc
[
ctxt_pP
->
module_id
],
rrc_ue_s1ap_ids
);
}
}
#endif
#endif
rrc_release_info
.
RRC_release_ctrl
[
release_num
].
flag
=
0
;
...
...
This diff is collapsed.
Click to expand it.
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