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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
eaeae880
Commit
eaeae880
authored
Oct 17, 2024
by
Guido Casati
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed unused wait_for_sync
parent
dfb90a17
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
14 deletions
+10
-14
executables/lte-enb.c
executables/lte-enb.c
+3
-2
executables/lte-softmodem.c
executables/lte-softmodem.c
+2
-2
executables/lte-softmodem.h
executables/lte-softmodem.h
+1
-1
executables/nr-gnb.c
executables/nr-gnb.c
+2
-2
executables/nr-softmodem.c
executables/nr-softmodem.c
+1
-2
executables/nr-softmodem.h
executables/nr-softmodem.h
+1
-1
executables/softmodem-common.h
executables/softmodem-common.h
+0
-4
No files found.
executables/lte-enb.c
View file @
eaeae880
...
...
@@ -131,7 +131,7 @@ static struct {
extern
double
cpuf
;
void
init_eNB
(
int
);
void
init_eNB
();
void
stop_eNB
(
int
nb_inst
);
int
wakeup_tx
(
PHY_VARS_eNB
*
eNB
,
int
frame_rx
,
int
subframe_rx
,
int
frame_tx
,
int
subframe_tx
,
uint64_t
timestamp_tx
);
...
...
@@ -1219,7 +1219,8 @@ void init_eNB_afterRU(void) {
}
void
init_eNB
(
int
wait_for_sync
)
{
void
init_eNB
()
{
int
CC_id
;
int
inst
;
PHY_VARS_eNB
*
eNB
;
...
...
executables/lte-softmodem.c
View file @
eaeae880
...
...
@@ -532,8 +532,8 @@ int main ( int argc, char **argv )
printf
(
"RC.nb_L1_inst:%d
\n
"
,
RC
.
nb_L1_inst
);
if
(
RC
.
nb_L1_inst
>
0
)
{
printf
(
"Initializing eNB threads
wait_for_sync:%d
\n
"
,
get_softmodem_params
()
->
wait_for_sync
);
init_eNB
(
get_softmodem_params
()
->
wait_for_sync
);
printf
(
"Initializing eNB threads
\n
"
);
init_eNB
();
}
for
(
int
x
=
0
;
x
<
RC
.
nb_L1_inst
;
x
++
)
for
(
int
CC_id
=
0
;
CC_id
<
RC
.
nb_L1_CC
[
x
];
CC_id
++
)
{
...
...
executables/lte-softmodem.h
View file @
eaeae880
...
...
@@ -138,7 +138,7 @@ extern int usrp_tx_thread;
// In lte-enb.c
extern
void
stop_eNB
(
int
);
extern
void
kill_eNB_proc
(
int
inst
);
extern
void
init_eNB
(
int
wait_for_sync
);
extern
void
init_eNB
();
// In lte-ru.c
extern
void
stop_ru
(
RU_t
*
ru
);
...
...
executables/nr-gnb.c
View file @
eaeae880
...
...
@@ -442,9 +442,9 @@ void init_eNB_afterRU(void) {
/**
* @brief Initialize gNB struct in RAN context
*/
void
init_gNB
(
int
wait_for_sync
)
void
init_gNB
()
{
LOG_I
(
NR_PHY
,
"Initializing gNB
threads wait_for_sync:%d
\n
"
,
wait_for_sync
);
LOG_I
(
NR_PHY
,
"Initializing gNB
RAN context: RC.nb_nr_L1_inst = %d
\n
"
,
RC
.
nb_nr_L1_inst
);
if
(
RC
.
gNB
==
NULL
)
{
RC
.
gNB
=
(
PHY_VARS_gNB
**
)
calloc_or_fail
(
RC
.
nb_nr_L1_inst
,
sizeof
(
PHY_VARS_gNB
*
));
LOG_D
(
NR_PHY
,
"gNB L1 structure RC.gNB allocated @ %p
\n
"
,
RC
.
gNB
);
...
...
executables/nr-softmodem.c
View file @
eaeae880
...
...
@@ -98,7 +98,6 @@ pthread_mutex_t sync_mutex;
int
sync_var
=-
1
;
//!< protected by mutex \ref sync_mutex.
int
config_sync_var
=-
1
;
int
oai_exit
=
0
;
static
int
wait_for_sync
=
0
;
unsigned
int
mmapped_dma
=
0
;
...
...
@@ -550,7 +549,7 @@ int main( int argc, char **argv ) {
if
(
RC
.
nb_nr_L1_inst
>
0
)
{
// Initialize gNB structure in RAN context
init_gNB
(
wait_for_sync
);
init_gNB
();
// Initialize L1
RCconfig_NR_L1
();
// Initialize Positioning Reference Signal configuration
...
...
executables/nr-softmodem.h
View file @
eaeae880
...
...
@@ -41,7 +41,7 @@ extern uint64_t ulsch_slot_bitmap;
extern
char
*
uecap_file
;
// In nr-gnb.c
extern
void
init_gNB
(
int
wait_for_sync
);
extern
void
init_gNB
();
extern
void
stop_gNB
(
int
);
// In nr-ru.c
...
...
executables/softmodem-common.h
View file @
eaeae880
...
...
@@ -125,7 +125,6 @@ extern "C"
#define DO_RA softmodem_params.do_ra
#define SA softmodem_params.sa
#define SL_MODE softmodem_params.sl_mode
#define WAIT_FOR_SYNC softmodem_params.wait_for_sync
#define CHAIN_OFFSET softmodem_params.chain_offset
#define NUMEROLOGY softmodem_params.numerology
#define BAND softmodem_params.band
...
...
@@ -161,7 +160,6 @@ extern int usrp_tx_thread;
{"clock-source", CONFIG_HLP_CLK, 0, .uptr=&CLOCK_SOURCE, .defintval=0, TYPE_UINT, 0}, \
{"time-source", CONFIG_HLP_TME, 0, .uptr=&TIMING_SOURCE, .defintval=0, TYPE_UINT, 0}, \
{"tune-offset", CONFIG_HLP_TUNE_OFFSET, 0, .dblptr=&TUNE_OFFSET, .defintval=0, TYPE_DOUBLE, 0}, \
{"wait-for-sync", NULL, PARAMFLAG_BOOL, .iptr=&WAIT_FOR_SYNC, .defintval=0, TYPE_INT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, .u64ptr=&(downlink_frequency[0][0]), .defuintval=0, TYPE_UINT64, 0}, \
{"CO" , CONFIG_HLP_ULF, 0, .iptr=&(uplink_frequency_offset[0][0]), .defintval=0, TYPE_INT, 0}, \
{"a" , CONFIG_HLP_CHOFF, 0, .iptr=&CHAIN_OFFSET, .defintval=0, TYPE_INT, 0}, \
...
...
@@ -224,7 +222,6 @@ extern int usrp_tx_thread;
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s5 = { NULL } }, \
{ .s3a = { config_checkstr_assign_integer, \
{"MONOLITHIC", "PNF", "VNF", "AERIAL","UE_STUB_PNF","UE_STUB_OFFNET","STANDALONE_PNF"}, \
{NFAPI_MONOLITHIC, NFAPI_MODE_PNF, NFAPI_MODE_VNF, NFAPI_MODE_AERIAL,NFAPI_UE_STUB_PNF,NFAPI_UE_STUB_OFFNET,NFAPI_MODE_STANDALONE_PNF}, \
...
...
@@ -309,7 +306,6 @@ typedef struct {
uint8_t
sl_mode
;
uint8_t
usim_test
;
int
emulate_rf
;
int
wait_for_sync
;
//eNodeB only
int
chain_offset
;
int
numerology
;
int
band
;
...
...
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