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
wangjie
OpenXG-RAN
Commits
1a4133cd
Commit
1a4133cd
authored
Nov 24, 2020
by
xuyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove some log to test ping
parent
def7b27f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
21 deletions
+19
-21
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-4
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_srb.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_srb.c
+1
-1
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+7
-7
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+8
-8
No files found.
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
View file @
1a4133cd
...
@@ -284,7 +284,7 @@ void nr_ue_rsrp_measurements(PHY_VARS_NR_UE *ue,
...
@@ -284,7 +284,7 @@ void nr_ue_rsrp_measurements(PHY_VARS_NR_UE *ue,
if
(
eNB_offset
==
0
)
if
(
eNB_offset
==
0
)
LOG_
I
(
PHY
,
"[UE %d] slot %d RRC Measurements (idx %d, Cell id %d) => rsrp: %3.1f dBm/RE (%d)
\n
"
,
LOG_
D
(
PHY
,
"[UE %d] slot %d RRC Measurements (idx %d, Cell id %d) => rsrp: %3.1f dBm/RE (%d)
\n
"
,
ue
->
Mod_id
,
ue
->
Mod_id
,
slot
,
eNB_offset
,
slot
,
eNB_offset
,
(
eNB_offset
>
0
)
?
ue
->
measurements
.
adj_cell_id
[
eNB_offset
-
1
]
:
ue
->
frame_parms
.
Nid_cell
,
(
eNB_offset
>
0
)
?
ue
->
measurements
.
adj_cell_id
[
eNB_offset
-
1
]
:
ue
->
frame_parms
.
Nid_cell
,
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
1a4133cd
...
@@ -958,7 +958,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
...
@@ -958,7 +958,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
void
*
pduP
,
void
*
pduP
,
uint16_t
cell_id
)
uint16_t
cell_id
)
{
{
LOG_
I
(
MAC
,
"[L2][MAC] decode mib
\n
"
);
LOG_
D
(
MAC
,
"[L2][MAC] decode mib
\n
"
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
NR_UE_MAC_INST_t
*
mac
=
get_mac_inst
(
module_id
);
...
@@ -1065,7 +1065,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
...
@@ -1065,7 +1065,7 @@ int8_t nr_ue_decode_mib(module_id_t module_id,
num_rbs
=
table_38213_13_4_c2
[
index_4msb
];
num_rbs
=
table_38213_13_4_c2
[
index_4msb
];
num_symbols
=
table_38213_13_4_c3
[
index_4msb
];
num_symbols
=
table_38213_13_4_c3
[
index_4msb
];
rb_offset
=
table_38213_13_4_c4
[
index_4msb
];
rb_offset
=
table_38213_13_4_c4
[
index_4msb
];
LOG_
I
(
MAC
,
"<<<<<<<<<index_4msb %d num_rbs %d num_symb %d rb_offset %d
\n
"
,
index_4msb
,
num_rbs
,
num_symbols
,
rb_offset
);
LOG_
D
(
MAC
,
"<<<<<<<<<index_4msb %d num_rbs %d num_symb %d rb_offset %d
\n
"
,
index_4msb
,
num_rbs
,
num_symbols
,
rb_offset
);
}
else
if
(
min_channel_bw
&
bw_40MHz
){
}
else
if
(
min_channel_bw
&
bw_40MHz
){
AssertFatal
(
index_4msb
<
10
,
"38.213 Table 13-6 4 MSB out of range
\n
"
);
AssertFatal
(
index_4msb
<
10
,
"38.213 Table 13-6 4 MSB out of range
\n
"
);
mac
->
type0_pdcch_ss_mux_pattern
=
1
;
mac
->
type0_pdcch_ss_mux_pattern
=
1
;
...
@@ -3922,8 +3922,6 @@ void nr_ue_send_sdu(module_id_t module_idP,
...
@@ -3922,8 +3922,6 @@ void nr_ue_send_sdu(module_id_t module_idP,
LOG_T
(
MAC
,
"
\n
"
);
LOG_T
(
MAC
,
"
\n
"
);
#endif
#endif
log_dump
(
MAC
,
pduP
,
16
,
LOG_DUMP_CHAR
,
"UE DLSCH payload : "
);
// Processing MAC PDU
// Processing MAC PDU
// it parses MAC CEs subheaders, MAC CEs, SDU subheaderds and SDUs
// it parses MAC CEs subheaders, MAC CEs, SDU subheaderds and SDUs
if
(
pduP
!=
NULL
)
if
(
pduP
!=
NULL
)
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_srb.c
View file @
1a4133cd
...
@@ -56,7 +56,7 @@ void nr_pdcp_entity_srb_recv_sdu(nr_pdcp_entity_t *_entity, char *buffer, int si
...
@@ -56,7 +56,7 @@ void nr_pdcp_entity_srb_recv_sdu(nr_pdcp_entity_t *_entity, char *buffer, int si
/* For now use padding for the MAC-I bytes (normally carrying message authentication code)
/* For now use padding for the MAC-I bytes (normally carrying message authentication code)
* which come after the data payload bytes (38.323, section 6.2.2.1) */
* which come after the data payload bytes (38.323, section 6.2.2.1) */
for
(
int
i
=
size
+
2
;
i
<
size
+
6
;
i
++
)
for
(
int
i
=
size
+
2
;
i
<
size
+
6
;
i
++
)
buf
[
i
]
=
0x11
*
i
;
buf
[
i
]
=
0x11
*
(
i
-
size
-
1
)
;
entity
->
common
.
deliver_pdu
(
entity
->
common
.
deliver_pdu_data
,
entity
->
common
.
deliver_pdu
(
entity
->
common
.
deliver_pdu_data
,
(
nr_pdcp_entity_t
*
)
entity
,
buf
,
size
+
6
,
sdu_id
);
(
nr_pdcp_entity_t
*
)
entity
,
buf
,
size
+
6
,
sdu_id
);
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
1a4133cd
...
@@ -295,9 +295,9 @@ printf("\n\n\n########## nas_sock_fd read returns len %d\n", len);
...
@@ -295,9 +295,9 @@ printf("\n\n\n########## nas_sock_fd read returns len %d\n", len);
ctxt
.
rnti
=
rnti
;
ctxt
.
rnti
=
rnti
;
//
pdcp_data_req(&ctxt, SRB_FLAG_NO, lc_id, RLC_MUI_UNDEFINED,
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
lc_id
,
RLC_MUI_UNDEFINED
,
//
RLC_SDU_CONFIRM_NO, len, (unsigned char *)rx_buf,
RLC_SDU_CONFIRM_NO
,
len
,
(
unsigned
char
*
)
rx_buf
,
//
PDCP_TRANSMISSION_MODE_DATA, NULL, NULL);
PDCP_TRANSMISSION_MODE_DATA
,
NULL
,
NULL
);
}
}
return
NULL
;
return
NULL
;
...
@@ -339,9 +339,9 @@ printf("\n\n\n########## nas_sock_fd read returns len %d\n", len);
...
@@ -339,9 +339,9 @@ printf("\n\n\n########## nas_sock_fd read returns len %d\n", len);
ctxt
.
rnti
=
rnti
;
ctxt
.
rnti
=
rnti
;
//
pdcp_data_req(&ctxt, SRB_FLAG_NO, lc_id, RLC_MUI_UNDEFINED,
pdcp_data_req
(
&
ctxt
,
SRB_FLAG_NO
,
lc_id
,
RLC_MUI_UNDEFINED
,
//
RLC_SDU_CONFIRM_NO, len, (unsigned char *)rx_buf,
RLC_SDU_CONFIRM_NO
,
len
,
(
unsigned
char
*
)
rx_buf
,
//
PDCP_TRANSMISSION_MODE_DATA, NULL, NULL);
PDCP_TRANSMISSION_MODE_DATA
,
NULL
,
NULL
);
}
}
return
NULL
;
return
NULL
;
...
@@ -466,7 +466,7 @@ static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t
...
@@ -466,7 +466,7 @@ static void deliver_sdu_drb(protocol_ctxt_t *ctxt_pP,void *_ue, nr_pdcp_entity_t
int
i
;
int
i
;
if
(
1
)
{
//(IS_SOFTMODEM_NOS1){
if
(
1
)
{
//(IS_SOFTMODEM_NOS1){
#if
1
#if
0
log_dump(PDCP,buf,size,LOG_DUMP_CHAR," PDCP Received SDU:\n");
log_dump(PDCP,buf,size,LOG_DUMP_CHAR," PDCP Received SDU:\n");
if (size > 4700)
if (size > 4700)
{
{
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
1a4133cd
...
@@ -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
;
...
...
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