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
cd8da4db
Commit
cd8da4db
authored
Nov 17, 2022
by
jperaldi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bad rebase done on VTP management
parent
e12ddace
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
6 deletions
+3
-6
cmake_targets/CMakeLists.txt
cmake_targets/CMakeLists.txt
+1
-1
openair3/SS/ss_eNB_vtp_task.c
openair3/SS/ss_eNB_vtp_task.c
+1
-2
targets/ARCH/SS/ss_config.h
targets/ARCH/SS/ss_config.h
+0
-2
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+1
-1
No files found.
cmake_targets/CMakeLists.txt
View file @
cd8da4db
...
...
@@ -2083,9 +2083,9 @@ set(SS_SRC
${
OPENAIR3_DIR
}
/SS/ss_eNB_drb_task.c
${
OPENAIR3_DIR
}
/SS/ss_eNB_vt_timer_task.c
${
OPENAIR3_DIR
}
/SS/ss_gNB_srb_task.c
${
OPENAIR3_DIR
}
/SS/ss_eNB_multicell_helper.c
${
OPENAIR3_DIR
}
/SS/ss_gNB_port_man_task.c
${
OPENAIR3_DIR
}
/SS/ss_gNB_sys_task.c
${
OPENAIR3_DIR
}
/SS/ss_eNB_multicell_helper.c
)
file
(
GLOB ss_sidl
${
SIDL_CMPLR
}
/src/*.c
)
file
(
GLOB ss_acp
${
SIDL_DIR
}
/acp/src/*.c
)
...
...
openair3/SS/ss_eNB_vtp_task.c
View file @
cd8da4db
...
...
@@ -387,7 +387,7 @@ void *ss_eNB_vtp_process_itti_msg(void *notUsed)
}
LOG_A
(
ENB_APP
,
"[VTP] received VTP_UPD_TIM_INFO SFN: %d SF: %d
\n
"
,
tinfo
.
sfn
,
tinfo
.
sf
);
LOG_A
(
ENB_APP
,
"[VTP] received VTP_UPD_TIM_INFO SFN: %d SF: %d
\n
"
,
tinfo
.
sfn
,
tinfo
.
sf
);
if
(
SS_context
.
vtp_enabled
==
1
)
if
(
isConnected
==
true
)
ss_vtp_send_tinfo
(
TASK_VTP
,
&
tinfo
);
}
break
;
...
...
@@ -494,7 +494,6 @@ void* ss_eNB_vtp_task(void *arg) {
ss_eNB_wait_first_msg
();
SS_context
.
vtp_enabled
=
1
;
RC
.
ss
.
vtp_ready
=
1
;
ss_enable_vtp
();
sleep
(
1
);
...
...
targets/ARCH/SS/ss_config.h
View file @
cd8da4db
...
...
@@ -71,8 +71,6 @@ typedef struct ss_config_s {
int
mac_rlc_data_ind_frame
;
int
mac_rlc_data_ind_subframe
;
ss_l1macind_ctrl_t
l1macind
;
/** Cell Config Array */
ss_cell_config_t
ss_cell_list
[
8
];
}
ss_config_t
;
/**
typedef enum {
...
...
targets/RT/USER/lte-enb.c
View file @
cd8da4db
...
...
@@ -277,7 +277,7 @@ static inline int rxtx(PHY_VARS_eNB *eNB,
LOG_D
(
PHY
,
"[SS] SS_UPD_TIM_INFO from L1_Thread to SYS task itti_send_msg_to_task sfn %d sf %d"
,
eNB
->
UL_INFO
.
subframe
,
eNB
->
UL_INFO
.
frame
);
/** TODO: Need separate logging for SS */
}
MessageDef
*
message_p_vtp
=
itti_alloc_new_message
(
TASK_
VTP
,
INSTANCE_DEFAULT
,
SS_UPD_TIM_INFO
);
MessageDef
*
message_p_vtp
=
itti_alloc_new_message
(
TASK_
ENB_APP
,
0
,
SS_UPD_TIM_INFO
);
if
(
message_p_vtp
&&
RC
.
ss
.
vtp_ready
)
{
SS_UPD_TIM_INFO
(
message_p_vtp
).
sf
=
eNB
->
UL_INFO
.
subframe
;
...
...
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