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
promise
OpenXG-RAN
Commits
bbeb8002
Commit
bbeb8002
authored
Nov 25, 2020
by
Chenyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove logs
parent
1a4133cd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
15 deletions
+15
-15
openair1/PHY/CODING/nr_rate_matching.c
openair1/PHY/CODING/nr_rate_matching.c
+2
-2
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+10
-10
No files found.
openair1/PHY/CODING/nr_rate_matching.c
View file @
bbeb8002
...
@@ -485,8 +485,8 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
...
@@ -485,8 +485,8 @@ int nr_rate_matching_ldpc_rx(uint8_t Ilbrm,
}
}
ind
=
(
index_k0
[
BG
-
1
][
rvidx
]
*
Ncb
/
N
)
*
Z
;
ind
=
(
index_k0
[
BG
-
1
][
rvidx
]
*
Ncb
/
N
)
*
Z
;
AssertFatal
(
Foffset
<=
E
,
"Foffset %d > E %d
\n
"
,
Foffset
,
E
);
//
AssertFatal(Foffset <= E,"Foffset %d > E %d\n",Foffset,E);
AssertFatal
(
Foffset
<=
Ncb
,
"Foffset %d > Ncb %d
\n
"
,
Foffset
,
Ncb
);
//
AssertFatal(Foffset <= Ncb,"Foffset %d > Ncb %d\n",Foffset,Ncb);
#ifdef RM_DEBUG
#ifdef RM_DEBUG
printf
(
"nr_rate_matching_ldpc_rx: Clear %d, E %d, k0 %d, Ncb %d, rvidx %d
\n
"
,
clear
,
E
,
ind
,
Ncb
,
rvidx
);
printf
(
"nr_rate_matching_ldpc_rx: Clear %d, E %d, k0 %d, Ncb %d, rvidx %d
\n
"
,
clear
,
E
,
ind
,
Ncb
,
rvidx
);
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
bbeb8002
...
@@ -5009,7 +5009,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -5009,7 +5009,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
buflen_remain
=
buflen_remain
=
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
buflen
-
(
total_rlc_pdu_header_len
+
sdu_length_total
+
MAX_RLC_SDU_SUBHEADER_SIZE
);
LOG_
I
(
MAC
,
LOG_
D
(
MAC
,
"[UE %d] Frame %d : UL-DXCH -> ULSCH, RLC %d has %d bytes to "
"[UE %d] Frame %d : UL-DXCH -> ULSCH, RLC %d has %d bytes to "
"send (Transport Block size %d SDU Length Total %d , mac header len %d, buflen_remain %d )
\n
"
,
//BSR byte before Tx=%d
"send (Transport Block size %d SDU Length Total %d , mac header len %d, buflen_remain %d )
\n
"
,
//BSR byte before Tx=%d
module_idP
,
frameP
,
lcid
,
lcid_buffer_occupancy_new
,
module_idP
,
frameP
,
lcid
,
lcid_buffer_occupancy_new
,
...
@@ -5083,7 +5083,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -5083,7 +5083,7 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
ulsch_buffer
[
j
]
=
0
;
ulsch_buffer
[
j
]
=
0
;
}
}
log_dump
(
MAC
,
ulsch_buffer
,
16
,
LOG_DUMP_CHAR
,
"UE ULSCH payload : "
);
//
log_dump(MAC, ulsch_buffer, 16, LOG_DUMP_CHAR, "UE ULSCH payload : ");
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
LOG_I
(
MAC
,
"Printing UL MAC payload UE side, payload_offset: %d
\n
"
,
payload_offset
);
LOG_I
(
MAC
,
"Printing UL MAC payload UE side, payload_offset: %d
\n
"
,
payload_offset
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
bbeb8002
...
@@ -50,7 +50,7 @@ void nr_process_mac_pdu(
...
@@ -50,7 +50,7 @@ void nr_process_mac_pdu(
int
pdu_len
=
mac_pdu_len
;
int
pdu_len
=
mac_pdu_len
;
uint16_t
mac_ce_len
,
mac_subheader_len
,
mac_sdu_len
;
uint16_t
mac_ce_len
,
mac_subheader_len
,
mac_sdu_len
;
log_dump
(
MAC
,
pduP
,
16
,
LOG_DUMP_CHAR
,
"gNB ULSCH payload: "
);
//
log_dump(MAC, pduP, 16, LOG_DUMP_CHAR, "gNB ULSCH payload: ");
// For both DL/UL-SCH
// For both DL/UL-SCH
// Except:
// Except:
// - UL/DL-SCH: fixed-size MAC CE(known by LCID)
// - UL/DL-SCH: fixed-size MAC CE(known by LCID)
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
bbeb8002
...
@@ -1445,14 +1445,14 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
...
@@ -1445,14 +1445,14 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
// Release T300 timer
// Release T300 timer
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
T300_active
=
0
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
T300_active
=
0
;
nr_rrc_ue_process_masterCellGroup
(
//
nr_rrc_ue_process_masterCellGroup(
ctxt_pP
,
//
ctxt_pP,
gNB_index
,
//
gNB_index,
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
masterCellGroup
);
//
&dl_ccch_msg->message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup->masterCellGroup);
nr_sa_rrc_ue_process_radioBearerConfig
(
//
nr_sa_rrc_ue_process_radioBearerConfig(
ctxt_pP
,
//
ctxt_pP,
gNB_index
,
//
gNB_index,
&
dl_ccch_msg
->
message
.
choice
.
c1
->
choice
.
rrcSetup
->
criticalExtensions
.
choice
.
rrcSetup
->
radioBearerConfig
);
//
&dl_ccch_msg->message.choice.c1->choice.rrcSetup->criticalExtensions.choice.rrcSetup->radioBearerConfig);
nr_rrc_set_state
(
ctxt_pP
->
module_id
,
RRC_STATE_CONNECTED
);
nr_rrc_set_state
(
ctxt_pP
->
module_id
,
RRC_STATE_CONNECTED
);
nr_rrc_set_sub_state
(
ctxt_pP
->
module_id
,
RRC_SUB_STATE_CONNECTED
);
nr_rrc_set_sub_state
(
ctxt_pP
->
module_id
,
RRC_SUB_STATE_CONNECTED
);
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
rnti
=
ctxt_pP
->
rnti
;
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
rnti
=
ctxt_pP
->
rnti
;
...
@@ -2191,12 +2191,12 @@ rrc_ue_process_rrcReconfiguration(
...
@@ -2191,12 +2191,12 @@ rrc_ue_process_rrcReconfiguration(
ie
=
rrcReconfiguration
->
criticalExtensions
.
choice
.
rrcReconfiguration
;
ie
=
rrcReconfiguration
->
criticalExtensions
.
choice
.
rrcReconfiguration
;
if
(
ie
->
measConfig
!=
NULL
)
{
if
(
ie
->
measConfig
!=
NULL
)
{
LOG_I
(
NR_RRC
,
"Measurement Configuration is present
\n
"
);
LOG_I
(
NR_RRC
,
"Measurement Configuration is present
\n
"
);
nr_rrc_ue_process_measConfig
(
ctxt_pP
,
gNB_index
,
ie
->
measConfig
);
//
nr_rrc_ue_process_measConfig(ctxt_pP, gNB_index, ie->measConfig);
}
}
if
(
ie
->
radioBearerConfig
!=
NULL
)
{
if
(
ie
->
radioBearerConfig
!=
NULL
)
{
LOG_I
(
NR_RRC
,
"radio Bearer Configuration is present
\n
"
);
LOG_I
(
NR_RRC
,
"radio Bearer Configuration is present
\n
"
);
nr_sa_rrc_ue_process_radioBearerConfig
(
ctxt_pP
,
gNB_index
,
ie
->
radioBearerConfig
);
//
nr_sa_rrc_ue_process_radioBearerConfig(ctxt_pP, gNB_index, ie->radioBearerConfig);
}
}
/* Check if there is dedicated NAS information to forward to NAS */
/* Check if there is dedicated NAS information to forward to NAS */
...
...
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