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
常顺宇
OpenXG-RAN
Commits
f3f58741
Commit
f3f58741
authored
Nov 27, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
conflicts solved
parent
f997ebb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
50 deletions
+0
-50
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/nr_ru_procedures.c
+0
-50
No files found.
openair1/SCHED_NR/nr_ru_procedures.c
View file @
f3f58741
...
...
@@ -321,57 +321,7 @@ void nr_feptx_ofdm(RU_t *ru,int frame_tx,int tti_tx) {
}
<<<<<<<
HEAD
static
void
*
nr_feptx_prec_thread
(
void
*
param
)
{
RU_prec_t
*
prec
=
(
RU_prec_t
*
)
param
;
RU_t
*
ru
;
NR_DL_FRAME_PARMS
*
fp
;
int
symbol
;
int
p
;
int
aa
;
int32_t
*
bw
;
int32_t
**
txdataF
;
int32_t
**
txdataF_BF
;
while
(
!
oai_exit
)
{
if
(
wait_on_condition
(
&
prec
->
mutex_feptx_prec
,
&
prec
->
cond_feptx_prec
,
&
prec
->
instance_cnt_feptx_prec
,
"NR feptx prec thread"
)
<
0
)
break
;
ru
=
prec
->
ru
;
symbol
=
prec
->
symbol
;
p
=
prec
->
p
;
aa
=
prec
->
aa
;
fp
=
ru
->
nr_frame_parms
;
bw
=
ru
->
beam_weights
[
0
][
p
][
aa
];
txdataF
=
ru
->
common
.
txdataF
;
txdataF_BF
=
ru
->
common
.
txdataF_BF
;
multadd_cpx_vector
((
int16_t
*
)
&
txdataF
[
p
][
symbol
*
fp
->
ofdm_symbol_size
],
(
int16_t
*
)
bw
,
(
int16_t
*
)
&
txdataF_BF
[
aa
][
symbol
*
fp
->
ofdm_symbol_size
],
0
,
fp
->
ofdm_symbol_size
,
15
);
if
(
release_thread
(
&
prec
->
mutex_feptx_prec
,
&
prec
->
instance_cnt_feptx_prec
,
"NR feptx thread"
)
<
0
)
break
;
}
return
0
;
}
void
nr_feptx_prec_control
(
RU_t
*
ru
,
int
frame
,
int
tti_tx
)
{
int
ret
=
0
;
int
i
=
0
;
int
symbol
=
0
;
int
p
=
0
;
int
aa
=
0
;
NR_DL_FRAME_PARMS
*
fp
=
ru
->
nr_frame_parms
;
int
nb_antenna_ports
=
fp
->
Lmax
;
// for now logical antenna ports corresponds to SSB
RU_prec_t
*
prec
=
ru
->
proc
.
prec
;
PHY_VARS_gNB
**
gNB_list
=
ru
->
gNB_list
,
*
gNB
;
=======
void
nr_init_feptx_thread
(
RU_t
*
ru
)
{
>>>>>>>
40
bda9f8d0b916f124e89a928138f0863978f307
RU_proc_t
*
proc
=
&
ru
->
proc
;
RU_feptx_t
*
feptx
=
proc
->
feptx
;
...
...
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