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
zzha zzha
OpenXG-RAN
Commits
65ff4b78
Commit
65ff4b78
authored
Oct 22, 2023
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removal of some warnings and slight change to PRACH in
ru_info_t
parent
7a7b5fb4
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
radio/ETHERNET/oran/5g/oaioran.c
radio/ETHERNET/oran/5g/oaioran.c
+2
-2
radio/ETHERNET/oran/5g/oran_isolate.c
radio/ETHERNET/oran/5g/oran_isolate.c
+3
-2
radio/ETHERNET/oran/5g/oran_isolate.h
radio/ETHERNET/oran/5g/oran_isolate.h
+1
-1
No files found.
radio/ETHERNET/oran/5g/oaioran.c
View file @
65ff4b78
...
...
@@ -178,7 +178,7 @@ int read_prach_data(ru_info_t *ru, int frame, int slot)
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
)
{
int16_t
*
dst
,
*
src
;
int
idx
=
0
;
dst
=
(
int16_t
*
)((
uint8_t
*
)
ru
->
prach_buf
[
aa
])
;
// + (sym_idx*576));
dst
=
ru
->
prach_buf
[
aa
]
;
// + (sym_idx*576));
src
=
(
int16_t
*
)((
uint8_t
*
)
xran_ctx
->
sFHPrachRxBbuIoBufCtrlDecomp
[
tti
%
XRAN_N_FE_BUF_LEN
][
0
][
aa
].
sBufferList
.
pBuffers
[
sym_idx
].
pData
);
/* convert Network order to host order */
...
...
@@ -301,7 +301,7 @@ int xran_fh_rx_read_slot(ru_info_t *ru, int *frame, int *slot){
// This loop would better be more inner to avoid confusion and maybe also errors.
for
(
int32_t
sym_idx
=
0
;
sym_idx
<
XRAN_NUM_OF_SYMBOL_PER_SLOT
;
sym_idx
++
)
{
LOG_D
(
PHY
,
"ORAN RX %d.%d: CC %d, ant %d, sym %d, tti %d (mod %d)
\n
"
,
*
frame
,
*
slot
,
cc_id
,
ant_id
,
sym_idx
,
tti
,
tti
%
XRAN_N_FE_BUF_LEN
);
if
(
sym_idx
==
0
)
LOG_D
(
PHY
,
"ORAN RX %d.%d: CC %d, ant %d, sym %d, tti %d (mod %d) rxF %p
\n
"
,
*
frame
,
*
slot
,
cc_id
,
ant_id
,
sym_idx
,
tti
,
tti
%
XRAN_N_FE_BUF_LEN
,
rx_data
);
uint8_t
*
pData
=
xran_ctx
->
sFrontHaulRxBbuIoBufCtrl
[
tti
%
XRAN_N_FE_BUF_LEN
][
cc_id
][
ant_id
].
sBufferList
.
pBuffers
[
sym_idx
%
XRAN_NUM_OF_SYMBOL_PER_SLOT
].
pData
;
uint8_t
*
pPrbMapData
=
xran_ctx
->
sFrontHaulRxPrbMapBbuIoBufCtrl
[
tti
%
XRAN_N_FE_BUF_LEN
][
cc_id
][
ant_id
].
sBufferList
.
pBuffers
->
pData
;
struct
xran_prb_map
*
pPrbMap
=
(
struct
xran_prb_map
*
)
pPrbMapData
;
...
...
radio/ETHERNET/oran/5g/oran_isolate.c
View file @
65ff4b78
...
...
@@ -216,15 +216,16 @@ void oran_fh_if4p5_south_in(RU_t *ru,
ru_info_t
ru_info
;
ru_info
.
nb_rx
=
ru
->
nb_rx
;
ru_info
.
rxdataF
=
ru
->
common
.
rxdataF
;
ru_info
.
prach_buf
=
(
int
*
)
ru
->
prach_rxsigF
[
0
];
//index: [prach_oca][ant_id]
ru_info
.
prach_buf
=
ru
->
prach_rxsigF
[
0
];
//index: [prach_oca][ant_id]
RU_proc_t
*
proc
=
&
ru
->
proc
;
extern
uint16_t
sl_ahead
;
int
f
,
sl
;
LOG_D
(
PHY
,
"Read rxdataF %p,%p
\n
"
,
ru_info
.
rxdataF
[
0
],
ru_info
.
rxdataF
[
1
]);
start_meas
(
&
ru
->
rx_fhaul
);
int
ret
=
xran_fh_rx_read_slot
(
&
ru_info
,
&
f
,
&
sl
);
stop_meas
(
&
ru
->
rx_fhaul
);
LOG_D
(
PHY
,
"Read %d.%d
\n
"
,
f
,
sl
);
LOG_D
(
PHY
,
"Read %d.%d
rxdataF %p,%p
\n
"
,
f
,
sl
,
ru_info
.
rxdataF
[
0
],
ru_info
.
rxdataF
[
1
]
);
if
(
ret
!=
0
){
printf
(
"ORAN: %d.%d ORAN_fh_if4p5_south_in ERROR in RX function
\n
"
,
f
,
sl
);
}
...
...
radio/ETHERNET/oran/5g/oran_isolate.h
View file @
65ff4b78
...
...
@@ -41,7 +41,7 @@ typedef struct ru_info_s{
int32_t
**
txdataF_BF
;
// Needed for Prach
int
**
prach_buf
;
int
16_t
**
prach_buf
;
}
ru_info_t
;
int
xran_fh_rx_read_slot
(
ru_info_t
*
ru
,
int
*
frame
,
int
*
slot
);
...
...
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