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
b828a72c
Commit
b828a72c
authored
May 05, 2023
by
Vijay Chadachan
Committed by
Vijay C
May 09, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
8.3.1.4 passing changes
parent
32235e3c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
27 deletions
+9
-27
common/utils/ocp_itti/intertask_interface.h
common/utils/ocp_itti/intertask_interface.h
+0
-1
executables/create_tasks.c
executables/create_tasks.c
+1
-4
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+7
-7
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+1
-1
openair3/SS/ss_eNB_port_man_task.c
openair3/SS/ss_eNB_port_man_task.c
+0
-14
No files found.
common/utils/ocp_itti/intertask_interface.h
View file @
b828a72c
...
@@ -327,7 +327,6 @@ void *rrc_enb_process_msg(void *);
...
@@ -327,7 +327,6 @@ void *rrc_enb_process_msg(void *);
TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_M3AP_MCE, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SCTP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_ACP, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SS_PORTMAN_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
TASK_DEF(TASK_SYS_GNB, TASK_PRIORITY_MED, 200, NULL, NULL) \
...
...
executables/create_tasks.c
View file @
b828a72c
...
@@ -64,10 +64,7 @@ int create_tasks(uint32_t enb_nb) {
...
@@ -64,10 +64,7 @@ int create_tasks(uint32_t enb_nb) {
{
{
rc
=
itti_create_task
(
TASK_SS_PORTMAN
,
ss_eNB_port_man_eNB_task
,
NULL
);
rc
=
itti_create_task
(
TASK_SS_PORTMAN
,
ss_eNB_port_man_eNB_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SS manager failed
\n
"
);
AssertFatal
(
rc
>=
0
,
"Create task for SS manager failed
\n
"
);
#if 0
rc = itti_create_task(TASK_SS_PORTMAN_ACP, ss_eNB_port_man_acp_task, NULL);
AssertFatal(rc >= 0, "Create task for SS manager failed\n");
#endif
rc
=
itti_create_task
(
TASK_SYS
,
ss_eNB_sys_task
,
NULL
);
rc
=
itti_create_task
(
TASK_SYS
,
ss_eNB_sys_task
,
NULL
);
AssertFatal
(
rc
>=
0
,
"Create task for SS failed
\n
"
);
AssertFatal
(
rc
>=
0
,
"Create task for SS failed
\n
"
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
b828a72c
...
@@ -2474,7 +2474,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
...
@@ -2474,7 +2474,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
if
(
RC
.
ss
.
ulgrant_info
[
CC_id
].
ulGrantType
==
ON_SR_RECEPTION_PRESENT
)
if
(
RC
.
ss
.
ulgrant_info
[
CC_id
].
ulGrantType
==
ON_SR_RECEPTION_PRESENT
)
{
{
LOG_I
(
MAC
,
"%s ulGrantType = ON_SR_RECEPTION_PRESENT
\n
"
,
__FUNCTION__
);
LOG_I
(
MAC
,
"%s ulGrantType = ON_SR_RECEPTION_PRESENT
\n
"
,
__FUNCTION__
);
if
(
SR_received
==
1
)
//
if (SR_received == 1)
{
{
LOG_D
(
MAC
,
" %s ULGrantType: ON_SR_RECEPTION_PRESENT. ULGrant Scheduled at frame:%d subframe:%d
\n
"
,
LOG_D
(
MAC
,
" %s ULGrantType: ON_SR_RECEPTION_PRESENT. ULGrant Scheduled at frame:%d subframe:%d
\n
"
,
__FUNCTION__
,
__FUNCTION__
,
...
@@ -2482,11 +2482,11 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
...
@@ -2482,11 +2482,11 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
subframeP
);
subframeP
);
return
true
;
return
true
;
}
}
else
//
else
{
//
{
LOG_I
(
MAC
,
"%s ulGrantType = ON_SR_RECEPTION_PRESENT but NOT scheduling
\n
"
,
__FUNCTION__
);
//
LOG_I(MAC, "%s ulGrantType = ON_SR_RECEPTION_PRESENT but NOT scheduling\n", __FUNCTION__);
return
false
;
//
return false;
}
//
}
}
}
/* Handling periodic UL_Grant Configuration */
/* Handling periodic UL_Grant Configuration */
...
@@ -2519,7 +2519,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
...
@@ -2519,7 +2519,7 @@ bool check_ulGrant_Schedule(frame_t frameP, sub_frame_t subframeP, int CC_id, ui
}
}
else
else
{
{
return
fals
e
;
return
tru
e
;
}
}
}
}
RC
.
ss
.
ulgrant_info
[
CC_id
].
periodiGrantInfo
.
subframe_counter
=
0
;
RC
.
ss
.
ulgrant_info
[
CC_id
].
periodiGrantInfo
.
subframe_counter
=
0
;
...
...
openair2/LAYER2/MAC/mac.h
View file @
b828a72c
...
@@ -1378,7 +1378,7 @@ typedef struct eNB_MAC_INST_s {
...
@@ -1378,7 +1378,7 @@ typedef struct eNB_MAC_INST_s {
/// Pointer to IF module instance for PHY
/// Pointer to IF module instance for PHY
IF_Module_t
*
if_inst
;
IF_Module_t
*
if_inst
;
/// Common cell resources
/// Common cell resources
COMMON_channels_t
common_channels
[
NFAPI_CC_MAX
];
COMMON_channels_t
common_channels
[
MAX_NUM_CCs
];
/// current PDU index (BCH,MCH,DLSCH)
/// current PDU index (BCH,MCH,DLSCH)
int16_t
pdu_index
[
NFAPI_CC_MAX
];
int16_t
pdu_index
[
NFAPI_CC_MAX
];
...
...
openair3/SS/ss_eNB_port_man_task.c
View file @
b828a72c
...
@@ -552,20 +552,6 @@ void *ss_eNB_port_man_eNB_task(void *arg)
...
@@ -552,20 +552,6 @@ void *ss_eNB_port_man_eNB_task(void *arg)
return
NULL
;
return
NULL
;
}
}
void
*
ss_eNB_port_man_acp_task
(
void
*
arg
)
{
// ss_eNB_port_man_init();
while
(
1
)
{
/* Now handle notifications for other sockets */
// ss_eNB_read_from_socket(ctx_g);
sleep
(
1000
);
}
return
NULL
;
}
bool
ss_eNB_port_man_handle_enquiryTiming
(
struct
SYSTEM_CTRL_REQ
*
sys_req
)
bool
ss_eNB_port_man_handle_enquiryTiming
(
struct
SYSTEM_CTRL_REQ
*
sys_req
)
{
{
struct
SYSTEM_CTRL_CNF
cnf
;
struct
SYSTEM_CTRL_CNF
cnf
;
...
...
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