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
Michael Black
OpenXG-RAN
Commits
59cf14a0
Commit
59cf14a0
authored
Nov 03, 2021
by
ahadi
Browse files
Options
Browse Files
Download
Plain Diff
fixing nr_gold.c
parents
3d0c941d
3e6ad5f0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
1 deletion
+20
-1
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+2
-1
openair1/PHY/NR_REFSIG/nr_gold.c
openair1/PHY/NR_REFSIG/nr_gold.c
+18
-0
No files found.
openair1/PHY/INIT/nr_init.c
View file @
59cf14a0
...
...
@@ -209,7 +209,8 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
}
}
nr_init_prs
(...);
nr_init_prs
(
gNB
);
/* Generate low PAPR type 1 sequences for PUSCH DMRS, these are used if transform precoding is enabled. */
generate_lowpapr_typ1_refsig_sequences
(
SHRT_MAX
);
...
...
openair1/PHY/NR_REFSIG/nr_gold.c
View file @
59cf14a0
...
...
@@ -154,10 +154,17 @@ void nr_init_csi_rs(PHY_VARS_gNB* gNB, uint32_t Nid)
}
<<<<<<<
HEAD
void
nr_init_prs
(
PHY_VARS_gNB
*
gNB
,
uint32_t
symNum
)
{
unsigned
int
x1
,
x2
;
uint16_t
Nid
,
i_ssb
,
i_ssb2
;
=======
void
nr_init_prs
(
PHY_VARS_gNB
*
gNB
)
{
unsigned
int
x1
,
x2
;
uint16_t
Nid
;
>>>>>>>
3e6
ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
//unsigned char Lmax, l, n_hf, N_hf;
nfapi_nr_config_request_scf_t
*
cfg
=
&
gNB
->
gNB_config
;
NR_DL_FRAME_PARMS
*
fp
=
&
gNB
->
frame_parms
;
...
...
@@ -166,6 +173,7 @@ void nr_init_prs(PHY_VARS_gNB* gNB, uint32_t symNum)
Nid
=
cfg
->
cell_config
.
phy_cell_id
.
value
;
<<<<<<<
HEAD
//Lmax = fp->Lmax;
//N_hf = (Lmax == 4)? 2:1;
...
...
@@ -174,17 +182,27 @@ void nr_init_prs(PHY_VARS_gNB* gNB, uint32_t symNum)
i_ssb
=
sumNum
&
(
symbols_per_slot
-
1
);
i_ssb2
=
i_ssb
+
(
slot
<<
2
);
=======
for
(
slotNum
=
0
;
slotNum
<
fp
->
slots_per_frame
;
slotNum
++
)
{
for
(
symNum
=
0
;
symNum
<
fp
->
symbols_per_slot
;
symNum
++
)
{
>>>>>>>
3e6
ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
reset
=
1
;
// initial x2 for prs as 38.211
uint32_t
c_init1
,
c_init2
,
c_init3
;
uint32_t
pow22
=
1
<<
22
;
uint32_t
pow10
=
1
<<
10
;
c_init1
=
pow22
*
ceil
(
Nid
/
1024
);
<<<<<<<
HEAD
c_init2
=
pow10
*
(
slotnum
+
symNum
+
1
)
*
(
2
*
(
Nid
%
1024
)
+
1
);
c_init3
=
Nid
%
1024
;
x2
=
c_init1
+
c_init2
+
c_init3
;
=======
c_init2
=
pow10
*
(
slotNum
+
symNum
+
1
)
*
(
2
*
(
Nid
%
1024
)
+
1
);
c_init3
=
Nid
%
1024
;
x2
=
c_init1
+
c_init2
+
c_init3
;
>>>>>>>
3e6
ad5f0ee1bb1bfe4261c9c7d3e9bd5fda2008e
for
(
uint8_t
n
=
0
;
n
<
NR_MAX_PRS_INIT_LENGTH_DWORD
;
n
++
)
{
gNB
->
nr_gold_prs
[
slotNum
][
symNum
][
n
]
=
lte_gold_generic
(
&
x1
,
&
x2
,
reset
);
reset
=
0
;
...
...
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