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
bd533a22
Commit
bd533a22
authored
Jan 11, 2023
by
Vaibhav Shrivastava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
5G SRB acpinit changes and 5G SRB task name modify
parent
006f32bb
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
21 additions
and
17 deletions
+21
-17
common/utils/ocp_itti/intertask_interface.h
common/utils/ocp_itti/intertask_interface.h
+1
-0
executables/nr-softmodem.c
executables/nr-softmodem.c
+2
-2
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+4
-4
openair2/RRC/NR/L2_nr_interface.c
openair2/RRC/NR/L2_nr_interface.c
+4
-4
openair3/SS/ss_gNB_port_man_task.c
openair3/SS/ss_gNB_port_man_task.c
+3
-3
openair3/SS/ss_gNB_srb_task.c
openair3/SS/ss_gNB_srb_task.c
+7
-4
No files found.
common/utils/ocp_itti/intertask_interface.h
View file @
bd533a22
...
...
@@ -334,6 +334,7 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_SS_SYSIND_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_SRB_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_VNG, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_VTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_DRB, TASK_PRIORITY_MED, 200, NULL, NULL) \
...
...
executables/nr-softmodem.c
View file @
bd533a22
...
...
@@ -378,8 +378,8 @@ int create_gNB_tasks(uint32_t gnb_nb) {
return
-
1
;
}
if
(
itti_create_task
(
TASK_SS_SRB
,
ss_gNB_srb_task
,
NULL
)
<
0
)
{
LOG_E
(
SCTP
,
"Create task for SS SRB failed
\n
"
);
if
(
itti_create_task
(
TASK_SS_SRB
_GNB
,
ss_gNB_srb_task
,
NULL
)
<
0
)
{
LOG_E
(
SCTP
,
"Create task for SS SRB
GNB
failed
\n
"
);
return
-
1
;
}
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
bd533a22
...
...
@@ -780,8 +780,8 @@ static void deliver_sdu_srb(void *_ue, nr_pdcp_entity_t *entity,
srb_found:
{
LOG_I
(
PDCP
,
"PDCP Sending DCCH_PDU_IND/SS_NRRRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB
\n
"
,
SS_NRRRC_PDU_IND
);
MessageDef
*
message_p
=
itti_alloc_new_message
(
TASK_SS_SRB
,
0
,
SS_NRRRC_PDU_IND
);
LOG_I
(
PDCP
,
"PDCP Sending DCCH_PDU_IND/SS_NRRRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB
_GNB
\n
"
,
SS_NRRRC_PDU_IND
);
MessageDef
*
message_p
=
itti_alloc_new_message
(
TASK_SS_SRB
_GNB
,
0
,
SS_NRRRC_PDU_IND
);
if
(
message_p
)
{
/* Populate the message and send to SS */
SS_NRRRC_PDU_IND
(
message_p
).
sdu_size
=
size
;
...
...
@@ -792,9 +792,9 @@ static void deliver_sdu_srb(void *_ue, nr_pdcp_entity_t *entity,
memset
(
SS_NRRRC_PDU_IND
(
message_p
).
sdu
,
0
,
SDU_SIZE
);
memcpy
(
SS_NRRRC_PDU_IND
(
message_p
).
sdu
,
buf
,
size
);
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
,
0
,
message_p
);
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
_GNB
,
0
,
message_p
);
if
(
send_res
<
0
)
{
LOG_E
(
PDCP
,
"Error in sending DCCH_PDU_IND/SS_NRRRC_PDU_IND(msg_Id:%d) to TASK_SS_SRB
\n
"
,
SS_NRRRC_PDU_IND
);
LOG_E
(
PDCP
,
"Error in sending DCCH_PDU_IND/SS_NRRRC_PDU_IND(msg_Id:%d) to TASK_SS_SRB
_GNB
\n
"
,
SS_NRRRC_PDU_IND
);
}
}
}
...
...
openair2/RRC/NR/L2_nr_interface.c
View file @
bd533a22
...
...
@@ -353,9 +353,9 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
LOG_D
(
NR_RRC
,
"[gNB %d] Received SDU for CCCH on SRB %ld
\n
"
,
module_idP
,
srb_idP
);
ctxt
.
brOption
=
brOption
;
if
(
sdu_lenP
>
0
)
{
LOG_I
(
NR_RRC
,
"NRRRC Sending CCCH_PDU_IND/SS_NRRRC_PDU_IND to TASK_SS_SRB (msg_Id:%d) [SFN: %d, SF: %d]
\n
"
,
LOG_I
(
NR_RRC
,
"NRRRC Sending CCCH_PDU_IND/SS_NRRRC_PDU_IND to TASK_SS_SRB
_GNB
(msg_Id:%d) [SFN: %d, SF: %d]
\n
"
,
SS_NRRRC_PDU_IND
,
ctxt
.
frame
,
ctxt
.
subframe
);
MessageDef
*
message_p
=
itti_alloc_new_message
(
TASK_SS_SRB
,
INSTANCE_DEFAULT
,
SS_NRRRC_PDU_IND
);
MessageDef
*
message_p
=
itti_alloc_new_message
(
TASK_SS_SRB
_GNB
,
INSTANCE_DEFAULT
,
SS_NRRRC_PDU_IND
);
if
(
message_p
)
{
/* Populate the message to SS */
SS_NRRRC_PDU_IND
(
message_p
).
sdu_size
=
sdu_lenP
;
...
...
@@ -366,9 +366,9 @@ int8_t nr_mac_rrc_data_ind(const module_id_t module_idP,
memset
(
SS_NRRRC_PDU_IND
(
message_p
).
sdu
,
0
,
SDU_SIZE
);
memcpy
(
SS_NRRRC_PDU_IND
(
message_p
).
sdu
,
sduP
,
sdu_lenP
);
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
,
INSTANCE_DEFAULT
,
message_p
);
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
_GNB
,
INSTANCE_DEFAULT
,
message_p
);
if
(
send_res
<
0
)
{
LOG_E
(
RRC
,
"Error in sending CCCH_PDU_IND/SS_NRRRC_PDU_IND to TASK_SS_SRB
(msg_Id:%d) to TASK_SS_SR
B
\n
"
,
SS_NRRRC_PDU_IND
);
LOG_E
(
RRC
,
"Error in sending CCCH_PDU_IND/SS_NRRRC_PDU_IND to TASK_SS_SRB
_GNB (msg_Id:%d) to TASK_SS_SRB_GN
B
\n
"
,
SS_NRRRC_PDU_IND
);
}
}
nr_rrc_gNB_decode_ccch
(
&
ctxt
,
sduP
,
sdu_lenP
,
NULL
,
CC_id
);
...
...
openair3/SS/ss_gNB_port_man_task.c
View file @
bd533a22
...
...
@@ -279,7 +279,7 @@ static inline void ss_gNB_read_from_socket(acpCtx_t ctx)
// No message (timeout on socket)
if
(
RC
.
ss
.
mode
>=
SS_SOFTMODEM
&&
RC
.
ss
.
State
>=
SS_STATE_CELL_ACTIVE
)
{
LOG_A
(
ENB_SS
,
"[SS-PORTMAN] Sending Wake up signal/SS_RRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB task
\n
"
,
SS_NRRRC_PDU_IND
);
LOG_A
(
ENB_SS
,
"[SS-PORTMAN] Sending Wake up signal/SS_RRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB
_GNB
task
\n
"
,
SS_NRRRC_PDU_IND
);
MessageDef
*
message_p
=
itti_alloc_new_message
(
TASK_SS_PORTMAN
,
0
,
SS_RRC_PDU_IND
);
if
(
message_p
)
{
...
...
@@ -290,10 +290,10 @@ static inline void ss_gNB_read_from_socket(acpCtx_t ctx)
SS_NRRRC_PDU_IND
(
message_p
).
frame
=
-
1
;
SS_NRRRC_PDU_IND
(
message_p
).
subframe
=
-
1
;
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
,
0
,
message_p
);
int
send_res
=
itti_send_msg_to_task
(
TASK_SS_SRB
_GNB
,
0
,
message_p
);
if
(
send_res
<
0
)
{
LOG_A
(
ENB_SS
,
"Error in sending Wake up signal /SS_NRRRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB
\n
"
,
SS_NRRRC_PDU_IND
);
LOG_A
(
ENB_SS
,
"Error in sending Wake up signal /SS_NRRRC_PDU_IND (msg_Id:%d) to TASK_SS_SRB
_GNB
\n
"
,
SS_NRRRC_PDU_IND
);
}
}
}
...
...
openair3/SS/ss_gNB_srb_task.c
View file @
bd533a22
...
...
@@ -336,7 +336,10 @@ void ss_gNB_srb_init(void)
// Port number
int
port
=
RC
.
ss
.
Srbport
;
acpInit
(
malloc
,
free
,
1000
);
if
(
RC
.
ss
.
mode
==
SS_SOFTMODEM_SRB
)
{
acpInit
(
malloc
,
free
,
1000
);
}
// Register user services/notifications in message table
const
struct
acpMsgTable
msgTable
[]
=
{
...
...
@@ -368,8 +371,8 @@ void ss_gNB_srb_init(void)
{
SS_context
.
State
=
SS_STATE_CELL_ACTIVE
;
}
itti_subscribe_event_fd
(
TASK_SS_SRB
,
fd1
);
itti_mark_task_ready
(
TASK_SS_SRB
);
itti_subscribe_event_fd
(
TASK_SS_SRB
_GNB
,
fd1
);
itti_mark_task_ready
(
TASK_SS_SRB
_GNB
);
}
//------------------------------------------------------------------------------
...
...
@@ -378,7 +381,7 @@ void *ss_gNB_srb_process_itti_msg(void *notUsed)
MessageDef
*
received_msg
=
NULL
;
int
result
=
0
;
itti_receive_msg
(
TASK_SS_SRB
,
&
received_msg
);
itti_receive_msg
(
TASK_SS_SRB
_GNB
,
&
received_msg
);
/* Check if there is a packet to handle */
if
(
received_msg
!=
NULL
)
...
...
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