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
canghaiwuhen
OpenXG-RAN
Commits
33dd9474
Commit
33dd9474
authored
Nov 21, 2020
by
xuyue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
reach NR_RRCReconfiguration,but complete no recv in gNB
parent
45e5ddc8
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
36 additions
and
18 deletions
+36
-18
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+2
-0
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-1
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+1
-1
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/L2_nr_interface.c
+2
-2
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+28
-13
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_UE.c
+1
-0
No files found.
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
33dd9474
...
@@ -5083,6 +5083,8 @@ nr_ue_get_sdu(module_id_t module_idP, int CC_id, frame_t frameP,
...
@@ -5083,6 +5083,8 @@ 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 : "
);
#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
);
for
(
int
i
=
0
;
i
<
buflen
;
i
++
)
{
for
(
int
i
=
0
;
i
<
buflen
;
i
++
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
33dd9474
...
@@ -498,7 +498,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
...
@@ -498,7 +498,7 @@ void nr_simple_dlsch_preprocessor(module_id_t module_id,
lcid
,
lcid
,
0
,
0
,
0
);
0
);
sched_ctrl
->
rlc_status
[
lcid
].
bytes_in_buffer
=
500
;
//
sched_ctrl->rlc_status[lcid].bytes_in_buffer = 500;
LOG_I
(
MAC
,
LOG_I
(
MAC
,
"%d.%d, DTCH%d->DLSCH, RLC status %d bytes
\n
"
,
"%d.%d, DTCH%d->DLSCH, RLC status %d bytes
\n
"
,
frame
,
frame
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
33dd9474
...
@@ -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: "
);
// 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/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
33dd9474
...
@@ -145,7 +145,7 @@ nr_rrc_data_ind_ccch(
...
@@ -145,7 +145,7 @@ nr_rrc_data_ind_ccch(
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu_size
=
sdu_sizeP
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu_size
=
sdu_sizeP
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
gnb_index
=
0
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
gnb_index
=
0
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
CC_id
=
0
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
CC_id
=
0
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
rnti
=
0x1234
;
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
rnti
=
ctxt_pP
->
rnti
;
memcpy
(
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu
,
buffer_pP
,
sdu_sizeP
);
memcpy
(
NR_RRC_MAC_CCCH_DATA_IND
(
message_p
).
sdu
,
buffer_pP
,
sdu_sizeP
);
itti_send_msg_to_task
(
ctxt_pP
->
enb_flag
?
TASK_RRC_GNB
:
TASK_RRC_NRUE
,
ctxt_pP
->
instance
,
message_p
);
itti_send_msg_to_task
(
ctxt_pP
->
enb_flag
?
TASK_RRC_GNB
:
TASK_RRC_NRUE
,
ctxt_pP
->
instance
,
message_p
);
}
}
...
...
openair2/RRC/NR/L2_nr_interface.c
View file @
33dd9474
...
@@ -108,8 +108,8 @@ nr_rrc_data_req(
...
@@ -108,8 +108,8 @@ nr_rrc_data_req(
/* Hack: only trigger PDCP if in CU, otherwise it is triggered by RU threads
/* Hack: only trigger PDCP if in CU, otherwise it is triggered by RU threads
* Ideally, PDCP would not neet to be triggered like this but react to ITTI
* Ideally, PDCP would not neet to be triggered like this but react to ITTI
* messages automatically */
* messages automatically */
if
(
ctxt_pP
->
enb_flag
&&
NODE_IS_CU
(
RC
.
rrc
[
ctxt_pP
->
module_id
]
->
node_type
))
//
if (ctxt_pP->enb_flag && NODE_IS_CU(RC.rrc[ctxt_pP->module_id]->node_type))
pdcp_run
(
ctxt_pP
);
//
pdcp_run(ctxt_pP);
return
TRUE
;
// TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
return
TRUE
;
// TODO should be changed to a CNF message later, currently RRC lite does not used the returned value anyway.
}
}
...
...
openair2/RRC/NR/rrc_gNB.c
View file @
33dd9474
...
@@ -402,6 +402,15 @@ rrc_gNB_generate_RRCSetup(
...
@@ -402,6 +402,15 @@ rrc_gNB_generate_RRCSetup(
ue_context_pP
->
ue_context
.
ue_release_timer_thres
=
1000
;
ue_context_pP
->
ue_context
.
ue_release_timer_thres
=
1000
;
/* init timers */
/* init timers */
// ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
// ue_context_pP->ue_context.ue_rrc_inactivity_timer = 0;
nr_rrc_data_req
(
ctxt_pP
,
DCCH
,
rrc_gNB_mui
++
,
SDU_CONFIRM_NO
,
ue_p
->
Srb0
.
Tx_buffer
.
payload_size
,
ue_p
->
Srb0
.
Tx_buffer
.
Payload
,
PDCP_TRANSMISSION_MODE_CONTROL
);
#ifdef ITTI_SIM
#ifdef ITTI_SIM
MessageDef
*
message_p
;
MessageDef
*
message_p
;
uint8_t
*
message_buffer
;
uint8_t
*
message_buffer
;
...
@@ -1298,13 +1307,14 @@ void *rrc_gnb_task(void *args_p) {
...
@@ -1298,13 +1307,14 @@ void *rrc_gnb_task(void *args_p) {
/* Messages from MAC */
/* Messages from MAC */
case
NR_RRC_MAC_CCCH_DATA_IND
:
case
NR_RRC_MAC_CCCH_DATA_IND
:
// PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt,
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
// NR_RRC_MAC_CCCH_DATA_IND(msg_p).gnb_index,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
gnb_index
,
// GNB_FLAG_YES,
GNB_FLAG_YES
,
// NR_RRC_MAC_CCCH_DATA_IND(msg_p).rnti,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
rnti
,
// msg_p->ittiMsgHeader.lte_time.frame,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
// msg_p->ittiMsgHeader.lte_time.slot);
msg_p
->
ittiMsgHeader
.
lte_time
.
slot
);
LOG_I
(
NR_RRC
,
"Decoding CCCH : inst %d, CC_id %d, ctxt %p, sib_info_p->Rx_buffer.payload_size %d
\n
"
,
LOG_I
(
NR_RRC
,
"Decoding CCCH : ue %d, inst %d, CC_id %d, ctxt %p, size %d
\n
"
,
ctxt
.
rnti
,
instance
,
instance
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
CC_id
,
NR_RRC_MAC_CCCH_DATA_IND
(
msg_p
).
CC_id
,
&
ctxt
,
&
ctxt
,
...
@@ -1324,12 +1334,17 @@ void *rrc_gnb_task(void *args_p) {
...
@@ -1324,12 +1334,17 @@ void *rrc_gnb_task(void *args_p) {
/* Messages from PDCP */
/* Messages from PDCP */
case
NR_RRC_DCCH_DATA_IND
:
case
NR_RRC_DCCH_DATA_IND
:
// PROTOCOL_CTXT_SET_BY_INSTANCE(&ctxt,
PROTOCOL_CTXT_SET_BY_INSTANCE
(
&
ctxt
,
// instance,
instance
,
// ENB_FLAG_YES,
ENB_FLAG_YES
,
// RRC_DCCH_DATA_IND(msg_p).rnti,
RRC_DCCH_DATA_IND
(
msg_p
).
rnti
,
// msg_p->ittiMsgHeader.lte_time.frame,
msg_p
->
ittiMsgHeader
.
lte_time
.
frame
,
// msg_p->ittiMsgHeader.lte_time.slot);
msg_p
->
ittiMsgHeader
.
lte_time
.
slot
);
LOG_I
(
NR_RRC
,
"Decoding DCCH : ue %d, inst %d, ctxt %p, size %d
\n
"
,
ctxt
.
rnti
,
instance
,
&
ctxt
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
sdu_size
);
LOG_D
(
NR_RRC
,
PROTOCOL_NR_RRC_CTXT_UE_FMT
" Received on DCCH %d %s
\n
"
,
LOG_D
(
NR_RRC
,
PROTOCOL_NR_RRC_CTXT_UE_FMT
" Received on DCCH %d %s
\n
"
,
PROTOCOL_NR_RRC_CTXT_UE_ARGS
(
&
ctxt
),
PROTOCOL_NR_RRC_CTXT_UE_ARGS
(
&
ctxt
),
NR_RRC_DCCH_DATA_IND
(
msg_p
).
dcch_index
,
NR_RRC_DCCH_DATA_IND
(
msg_p
).
dcch_index
,
...
...
openair2/RRC/NR_UE/rrc_UE.c
View file @
33dd9474
...
@@ -1416,6 +1416,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
...
@@ -1416,6 +1416,7 @@ int8_t nr_rrc_ue_decode_ccch( const protocol_ctxt_t *const ctxt_pP, const NR_SRB
return
-
1
;
return
-
1
;
}
}
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
State
=
NR_RRC_SI_RECEIVED
;
if
(
dl_ccch_msg
->
message
.
present
==
NR_DL_CCCH_MessageType_PR_c1
)
{
if
(
dl_ccch_msg
->
message
.
present
==
NR_DL_CCCH_MessageType_PR_c1
)
{
if
(
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
State
==
NR_RRC_SI_RECEIVED
)
{
if
(
NR_UE_rrc_inst
[
ctxt_pP
->
module_id
].
Info
[
gNB_index
].
State
==
NR_RRC_SI_RECEIVED
)
{
switch
(
dl_ccch_msg
->
message
.
choice
.
c1
->
present
)
{
switch
(
dl_ccch_msg
->
message
.
choice
.
c1
->
present
)
{
...
...
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