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
8cc6c0cb
Commit
8cc6c0cb
authored
Aug 13, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Various places: remove printf and/or transform to LOG_D
parent
83d93970
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
16 deletions
+8
-16
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+1
-1
openair1/PHY/defs_common.h
openair1/PHY/defs_common.h
+4
-8
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+2
-6
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
+1
-1
No files found.
openair1/PHY/INIT/nr_init.c
View file @
8cc6c0cb
...
...
@@ -406,7 +406,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config)
LOG_I
(
PHY
,
"DL frequency %lu Hz, UL frequency %lu Hz: band %d, uldl offset %d Hz
\n
"
,
fp
->
dl_CarrierFreq
,
fp
->
ul_CarrierFreq
,
fp
->
nr_band
,
dlul_offset
);
fp
->
threequarter_fs
=
get_softmodem_params
()
->
threequarter_fs
;
LOG_
A
(
PHY
,
"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)
\n
"
,
LOG_
D
(
PHY
,
"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)
\n
"
,
Mod_id
,
gNB_config
->
cell_config
.
phy_cell_id
.
value
,
(
unsigned
long
long
)
fp
->
dl_CarrierFreq
,
...
...
openair1/PHY/defs_common.h
View file @
8cc6c0cb
...
...
@@ -1050,21 +1050,17 @@ typedef uint8_t(encoder_if_t)(uint8_t *input,
extern
int
oai_exit
;
static
inline
void
wait_sync
(
char
*
thread_name
)
{
static
inline
void
wait_sync
(
char
*
thread_name
)
{
int
rc
;
printf
(
"waiting for sync (%s,%d/%p,%p,%p)
\n
"
,
thread_name
,
sync_var
,
&
sync_var
,
&
sync_cond
,
&
sync_mutex
);
LOG_D
(
PHY
,
"waiting for sync (%s,%d/%p,%p,%p)
\n
"
,
thread_name
,
sync_var
,
&
sync_var
,
&
sync_cond
,
&
sync_mutex
);
AssertFatal
((
rc
=
pthread_mutex_lock
(
&
sync_mutex
))
==
0
,
"sync mutex lock error"
);
while
(
sync_var
<
0
&&
!
oai_exit
)
pthread_cond_wait
(
&
sync_cond
,
&
sync_mutex
);
AssertFatal
((
rc
=
pthread_mutex_unlock
(
&
sync_mutex
))
==
0
,
"sync mutex unlock error"
);
printf
(
"got sync (%s)
\n
"
,
thread_name
);
/*
* Raphael Defosseux: added for CI to get faster the got sync message.
*/
fflush
(
stdout
);
fflush
(
stderr
);
LOG_D
(
PHY
,
"got sync (%s)
\n
"
,
thread_name
);
}
...
...
openair2/GNB_APP/gnb_config.c
View file @
8cc6c0cb
...
...
@@ -946,7 +946,6 @@ void RCconfig_NR_L1(void)
}
else
{
// other midhaul
}
}
// for (j = 0; j < RC.nb_nr_L1_inst; j++)
printf
(
"Initializing northbound interface for L1
\n
"
);
l1_north_init_gNB
();
}
else
{
LOG_I
(
PHY
,
"No "
CONFIG_STRING_L1_LIST
" configuration found"
);
...
...
@@ -1422,7 +1421,6 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"f1"
)
==
0
||
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_N_PREFERENCE_IDX
].
strptr
),
"cudu"
)
==
0
)
{
printf
(
"Configuring F1 interfaces for MACRLC
\n
"
);
char
**
f1caddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_IDX
].
strptr
;
RC
.
nrmac
[
j
]
->
eth_params_n
.
my_addr
=
strdup
(
*
f1caddr
);
char
**
f1uaddr
=
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_LOCAL_N_ADDRESS_F1U_IDX
].
strptr
;
...
...
@@ -1447,16 +1445,14 @@ void RCconfig_nr_macrlc(configmodule_interface_t *cfg)
RC
.
nrmac
[
j
]
->
eth_params_s
.
remote_portd
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_REMOTE_S_PORTD_IDX
].
iptr
);
RC
.
nrmac
[
j
]
->
eth_params_s
.
transp_preference
=
ETH_UDP_MODE
;
printf
(
"**************** vnf_port:%d
\n
"
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
);
configure_nr_nfapi_vnf
(
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_addr
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
remote_addr
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
remote_portd
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portd
);
printf
(
"**************** RETURNED FROM configure_nfapi_vnf() vnf_port:%d
\n
"
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
);
}
else
if
(
strcmp
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_PREFERENCE_IDX
].
strptr
),
"aerial"
)
==
0
){
#ifdef ENABLE_AERIAL
RC
.
nrmac
[
j
]
->
nvipc_params_s
.
nvipc_shm_prefix
=
strdup
(
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_SHM_PREFIX
].
strptr
));
RC
.
nrmac
[
j
]
->
nvipc_params_s
.
nvipc_poll_core
=
*
(
MacRLC_ParamList
.
paramarray
[
j
][
MACRLC_TRANSPORT_S_POLL_CORE
].
i8ptr
);
printf
(
"Configuring VNF for Aerial connection with prefix %s
\n
"
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
local_if_name
);
LOG_I
(
GNB_APP
,
"Configuring VNF for Aerial connection with prefix %s
\n
"
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
local_if_name
);
aerial_configure_nr_fapi_vnf
();
#endif
}
else
{
// other midhaul
...
...
@@ -1839,7 +1835,7 @@ void RCconfig_NRRRC(gNB_RRC_INST *rrc)
sprintf
(
aprefix
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
0
);
printf
(
"NRRRC %d: Southbound Transport %s
\n
"
,
i
,
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
));
LOG_D
(
GNB_APP
,
"NRRRC %d: Southbound Transport %s
\n
"
,
i
,
*
(
GNBParamList
.
paramarray
[
i
][
GNB_TRANSPORT_S_PREFERENCE_IDX
].
strptr
));
rrc
->
node_type
=
get_node_type
();
rrc
->
node_id
=
gnb_id
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_rrc_dl_handler.c
View file @
8cc6c0cb
...
...
@@ -823,7 +823,7 @@ void dl_rrc_message_transfer(const f1ap_dl_rrc_message_t *dl_rrc)
pthread_mutex_unlock
(
&
mac
->
sched_lock
);
if
(
!
du_exists_f1_ue_data
(
dl_rrc
->
gNB_DU_ue_id
))
{
LOG_
I
(
NR_MAC
,
"No CU UE ID stored for UE RNTI %04x, adding CU UE ID %d
\n
"
,
dl_rrc
->
gNB_DU_ue_id
,
dl_rrc
->
gNB_CU_ue_id
);
LOG_
D
(
NR_MAC
,
"No CU UE ID stored for UE RNTI %04x, adding CU UE ID %d
\n
"
,
dl_rrc
->
gNB_DU_ue_id
,
dl_rrc
->
gNB_CU_ue_id
);
f1_ue_data_t
new_ue_data
=
{.
secondary_ue
=
dl_rrc
->
gNB_CU_ue_id
};
du_add_f1_ue_data
(
dl_rrc
->
gNB_DU_ue_id
,
&
new_ue_data
);
}
...
...
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