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
6c4403fb
Commit
6c4403fb
authored
Nov 07, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve warnings "Set but not used"
parent
49efc912
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
37 deletions
+0
-37
radio/ETHERNET/oran/5g/app_io_fh_xran-E.c
radio/ETHERNET/oran/5g/app_io_fh_xran-E.c
+0
-25
radio/ETHERNET/oran/5g/oran_isolate.c
radio/ETHERNET/oran/5g/oran_isolate.c
+0
-4
radio/ETHERNET/oran/5g/sample-app-E.c
radio/ETHERNET/oran/5g/sample-app-E.c
+0
-8
No files found.
radio/ETHERNET/oran/5g/app_io_fh_xran-E.c
View file @
6c4403fb
...
...
@@ -93,12 +93,6 @@ app_io_xran_if_ctrl_get(uint32_t o_xu_id)
void
app_io_xran_fh_rx_callback
(
void
*
pCallbackTag
,
xran_status_t
status
)
{
int32_t
nCellIdx
;
int32_t
sym
,
nSlotIdx
;
struct
xran_cb_tag
*
pTag
=
(
struct
xran_cb_tag
*
)
pCallbackTag
;
nCellIdx
=
pTag
->
cellId
;
nSlotIdx
=
pTag
->
slotiId
;
///((status >> 16) & 0xFFFF); /** TTI aka slotIdx */
sym
=
pTag
->
symbol
&
0xFF
;
/* sym */
oai_xran_fh_rx_callback
(
pCallbackTag
,
status
);
rte_pause
();
return
;
...
...
@@ -892,7 +886,6 @@ app_io_xran_iq_content_init_cp_rx(uint8_t appMode, struct xran_fh_config *pXra
int16_t
ext_sec_total
=
0
;
int8_t
*
ext_buf
=
(
int8_t
*
)
xran_malloc
(
ext_len
);
int8_t
*
ext_buf_start
=
ext_buf
;
int16_t
*
ptr
=
NULL
;
if
(
ext_buf
)
{
ext_buf
+=
(
RTE_PKTMBUF_HEADROOM
+
sizeof
(
struct
xran_ecpri_hdr
)
+
...
...
@@ -904,7 +897,6 @@ app_io_xran_iq_content_init_cp_rx(uint8_t appMode, struct xran_fh_config *pXra
sizeof
(
struct
xran_cp_radioapp_section1_header
)
+
sizeof
(
struct
xran_cp_radioapp_section1
));
ptr
=
(
int16_t
*
)(
ul_bfw_pos
+
(
p_pRbMapElm
->
nRBStart
*
p_pRbMapElm
->
bf_weight
.
nAntElmTRx
)
*
4
);
ext_sec_total
=
xran_cp_populate_section_ext_1
((
int8_t
*
)
ext_buf
,
ext_len
,
(
int16_t
*
)
(
ul_bfw_pos
+
(
p_pRbMapElm
->
nRBStart
*
p_pRbMapElm
->
bf_weight
.
nAntElmTRx
)
*
4
),
...
...
@@ -1194,7 +1186,6 @@ app_io_xran_iq_content_init(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
struct
bbu_xran_io_if
*
psBbuIo
=
app_io_xran_if_get
();
struct
xran_io_shared_ctrl
*
psIoCtrl
=
app_io_xran_if_ctrl_get
(
o_xu_id
);
int32_t
nSectorIndex
[
XRAN_MAX_SECTOR_NR
];
int32_t
nSectorNum
;
int32_t
cc_id
,
ant_id
,
sym_id
,
tti
;
int32_t
flowId
;
...
...
@@ -1214,9 +1205,6 @@ app_io_xran_iq_content_init(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
rte_panic
(
"psIoCtrl == NULL
\n
"
);
}
for
(
nSectorNum
=
0
;
nSectorNum
<
XRAN_MAX_SECTOR_NR
;
nSectorNum
++
)
{
nSectorIndex
[
nSectorNum
]
=
nSectorNum
;
}
nSectorNum
=
p_o_xu_cfg
->
numCC
;
printf
(
"app_io_xran_iq_content_init
\n
"
);
...
...
@@ -1305,7 +1293,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
{
struct
bbu_xran_io_if
*
psBbuIo
=
app_io_xran_if_get
();
struct
xran_io_shared_ctrl
*
psIoCtrl
=
app_io_xran_if_ctrl_get
(
o_xu_id
);
int32_t
nSectorIndex
[
XRAN_MAX_SECTOR_NR
];
int32_t
nSectorNum
;
int32_t
cc_id
,
ant_id
,
sym_id
,
tti
;
int32_t
flowId
;
...
...
@@ -1327,10 +1314,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
if
(
psIoCtrl
==
NULL
)
rte_panic
(
"psIoCtrl == NULL
\n
"
);
for
(
nSectorNum
=
0
;
nSectorNum
<
XRAN_MAX_SECTOR_NR
;
nSectorNum
++
)
{
nSectorIndex
[
nSectorNum
]
=
nSectorNum
;
}
nSectorNum
=
p_o_xu_cfg
->
numCC
;
printf
(
"app_io_xran_iq_content_get
\n
"
);
...
...
@@ -1370,7 +1353,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
{
ptr
=
psIoCtrl
->
sFrontHaulRxBbuIoBufCtrl
[
tti
][
cc_id
][
ant_id
].
sBufferList
.
pBuffers
[
sym_id
].
pData
;
if
(
ptr
){
int32_t
payload_len
=
0
;
u32dptr
=
(
uint32_t
*
)(
ptr
);
if
(
pRbElm
->
compMethod
!=
XRAN_COMPMETHOD_NONE
){
struct
xranlib_decompress_request
bfp_decom_req
;
...
...
@@ -1403,7 +1385,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
bfp_decom_rsp
.
len
=
0
;
xranlib_decompress
(
&
bfp_decom_req
,
&
bfp_decom_rsp
);
payload_len
=
bfp_decom_rsp
.
len
;
}
else
{
u32dptr
=
(
uint32_t
*
)(
ptr
);
...
...
@@ -1421,7 +1402,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
pos
=
((
char
*
)
p_iq
->
p_rx_log_buffer
[
flowId
])
+
p_iq
->
rx_log_buffer_position
[
flowId
];
ptr
=
p_sec_desc
->
pData
;
if
(
ptr
){
int32_t
payload_len
=
0
;
u32dptr
=
(
uint32_t
*
)(
ptr
);
if
(
pRbElm
->
compMethod
!=
XRAN_COMPMETHOD_NONE
){
struct
xranlib_decompress_request
bfp_decom_req
;
...
...
@@ -1453,7 +1433,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
bfp_decom_rsp
.
len
=
0
;
xranlib_decompress
(
&
bfp_decom_req
,
&
bfp_decom_rsp
);
payload_len
=
bfp_decom_rsp
.
len
;
}
else
{
...
...
@@ -1478,7 +1457,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
pos
=
((
char
*
)
p_iq
->
p_rx_log_buffer
[
flowId
])
+
p_iq
->
rx_log_buffer_position
[
flowId
];
ptr
=
p_sec_desc
->
pData
;
if
(
ptr
){
int32_t
payload_len
=
0
;
u32dptr
=
(
uint32_t
*
)(
ptr
);
if
(
pRbElm
->
compMethod
!=
XRAN_COMPMETHOD_NONE
){
struct
xranlib_decompress_request
bfp_decom_req
;
...
...
@@ -1510,7 +1488,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
bfp_decom_rsp
.
len
=
0
;
xranlib_decompress
(
&
bfp_decom_req
,
&
bfp_decom_rsp
);
payload_len
=
bfp_decom_rsp
.
len
;
}
else
{
memcpy
(
pos
+
pRbElm
->
nRBStart
*
N_SC_PER_PRB
*
4
,
u32dptr
,
pRbElm
->
nRBSize
*
N_SC_PER_PRB
*
4
);
...
...
@@ -1653,7 +1630,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
pos
=
((
char
*
)
p_iq
->
p_srs_log_buffer
[
flowId
])
+
p_iq
->
srs_log_buffer_position
[
flowId
];
ptr
=
p_sec_desc
->
pData
;
if
(
ptr
)
{
int32_t
payload_len
=
0
;
u32dptr
=
(
uint32_t
*
)(
ptr
);
if
(
pRbElm
->
compMethod
!=
XRAN_COMPMETHOD_NONE
)
{
struct
xranlib_decompress_request
bfp_decom_req
;
...
...
@@ -1683,7 +1659,6 @@ app_io_xran_iq_content_get(uint32_t o_xu_id, RuntimeConfig *p_o_xu_cfg)
bfp_decom_rsp
.
len
=
0
;
xranlib_decompress
(
&
bfp_decom_req
,
&
bfp_decom_rsp
);
payload_len
=
bfp_decom_rsp
.
len
;
}
else
{
memcpy
(
pos
+
pRbElm
->
nRBStart
*
N_SC_PER_PRB
*
4
,
u32dptr
,
pRbElm
->
nRBSize
*
N_SC_PER_PRB
*
4
);
...
...
radio/ETHERNET/oran/5g/oran_isolate.c
View file @
6c4403fb
...
...
@@ -207,8 +207,6 @@ void oran_fh_if4p5_south_in(RU_t *ru,
int
*
frame
,
int
*
slot
)
{
static
uint8_t
sync
=
0
;
ru_info_t
ru_info
;
ru_info
.
nb_rx
=
ru
->
nb_rx
;
ru_info
.
rxdataF
=
ru
->
common
.
rxdataF
;
...
...
@@ -248,8 +246,6 @@ void oran_fh_if4p5_south_in(RU_t *ru,
*
slot
=
proc
->
tti_rx
;
LOG_I
(
PHY
,
"After adjusting, OAI: frame=%d slot=%d, XRAN: frame=%d slot=%d
\n
"
,
*
frame
,
*
slot
,
proc
->
frame_rx
,
proc
->
tti_rx
);
}
sync
=
1
;
}
void
oran_fh_if4p5_south_out
(
RU_t
*
ru
,
...
...
radio/ETHERNET/oran/5g/sample-app-E.c
View file @
6c4403fb
...
...
@@ -153,10 +153,7 @@ app_version_print(void)
char
*
compilation_date
=
__DATE__
;
char
*
compilation_time
=
__TIME__
;
uint32_t
nLen
;
snprintf
(
sysversion
,
99
,
"Version: %s"
,
VERSIONX
);
nLen
=
strlen
(
sysversion
);
printf
(
"
\n\n
"
);
printf
(
"===========================================================================================================
\n
"
);
...
...
@@ -210,7 +207,6 @@ app_parse_cmdline_args(int argc, char ** argv, struct sample_app_params* params)
{
int32_t
c
=
0
;
int32_t
vf_cnt
=
0
;
int32_t
*
pInt
;
int32_t
cnt
=
0
;
size_t
optlen
=
0
;
char
*
saveptr
=
NULL
;
...
...
@@ -241,7 +237,6 @@ app_parse_cmdline_args(int argc, char ** argv, struct sample_app_params* params)
break
;
cnt
+=
1
;
pInt
=
NULL
;
port
=
4
;
switch
(
c
)
{
...
...
@@ -952,10 +947,7 @@ int *oai_main(int argc, char *argv[])
exit
(
-
1
);
}
}
uint64_t
nActiveCoreMask
[
MAX_BBU_POOL_CORE_MASK
]
=
{
0
};
uint32_t
totalCC
=
0
;
nActiveCoreMask
[
0
]
=
((
1
<<
app_io_xran_fh_init
.
io_cfg
.
timing_core
)
|
app_io_xran_fh_init
.
io_cfg
.
pkt_proc_core
);
nActiveCoreMask
[
1
]
=
app_io_xran_fh_init
.
io_cfg
.
pkt_proc_core_64_127
;
for
(
o_xu_id
=
0
;
o_xu_id
<
p_usecaseConfiguration
->
oXuNum
;
o_xu_id
++
)
{
RuntimeConfig
*
p_o_xu_cfg
=
p_startupConfiguration
[
o_xu_id
];
...
...
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