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
d79a38bf
Commit
d79a38bf
authored
Jan 25, 2022
by
Rakesh Mundlamuri
Browse files
Options
Browse Files
Download
Plain Diff
fix merge conflicts
parents
edfe8c55
55c64483
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
309 additions
and
76 deletions
+309
-76
openair1/PHY/INIT/nr_init_ue.c
openair1/PHY/INIT/nr_init_ue.c
+6
-4
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.c
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.c
+28
-1
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h
+18
-0
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+253
-68
openair1/PHY/defs_nr_UE.h
openair1/PHY/defs_nr_UE.h
+2
-1
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
+1
-1
No files found.
openair1/PHY/INIT/nr_init_ue.c
View file @
d79a38bf
...
@@ -337,11 +337,13 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
...
@@ -337,11 +337,13 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
// PRS channel estimates
// PRS channel estimates
ue
->
prs_ch_estimates
=
(
int32_t
**
)
malloc16
(
fp
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
ue
->
prs_ch_estimates
=
(
int32_t
**
)
malloc16
(
fp
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
AssertFatal
(
ue
->
prs_ch_estimates
!=
NULL
,
"NR UE init: PRS channel estimates malloc failed
\n
"
);
ue
->
prs_ch_estimates_time
=
(
int32_t
**
)
malloc16
(
fp
->
nb_antennas_rx
*
sizeof
(
int32_t
*
)
);
AssertFatal
(((
ue
->
prs_ch_estimates
!=
NULL
)
||
(
ue
->
prs_ch_estimates_time
!=
NULL
)),
"NR UE init: PRS channel estimates malloc failed
\n
"
);
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
{
for
(
i
=
0
;
i
<
fp
->
nb_antennas_rx
;
i
++
)
{
ue
->
prs_ch_estimates
[
i
]
=
(
int32_t
*
)
malloc16
(
2
*
fp
->
ofdm_symbol_size
*
NR_MAX_NUM_PRS_SYMB
);
ue
->
prs_ch_estimates
[
i
]
=
(
int32_t
*
)
malloc16
(
2
*
fp
->
ofdm_symbol_size
*
NR_MAX_NUM_PRS_SYMB
);
AssertFatal
(
ue
->
prs_ch_estimates
[
i
]
!=
NULL
,
"NR UE init: PRS channel estimates malloc failed %d
\n
"
,
i
);
ue
->
prs_ch_estimates_time
[
i
]
=
(
int32_t
*
)
malloc16
(
2
*
fp
->
ofdm_symbol_size
*
NR_MAX_NUM_PRS_SYMB
);
AssertFatal
(((
ue
->
prs_ch_estimates
[
i
]
!=
NULL
)
||
(
ue
->
prs_ch_estimates_time
[
i
]
!=
NULL
)),
"NR UE init: PRS channel estimates malloc failed %d
\n
"
,
i
);
}
}
...
...
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.c
View file @
d79a38bf
...
@@ -23,6 +23,9 @@
...
@@ -23,6 +23,9 @@
short
filt16a_l0
[
16
]
=
{
short
filt16a_l0
[
16
]
=
{
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mm0
[
16
]
=
{
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_r0
[
16
]
=
{
short
filt16a_r0
[
16
]
=
{
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
24576
,
28672
,
0
,
0
,
0
,
0
};
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
24576
,
28672
,
0
,
0
,
0
,
0
};
...
@@ -32,6 +35,15 @@ short filt16a_m0[16] = {
...
@@ -32,6 +35,15 @@ short filt16a_m0[16] = {
short
filt16a_l1
[
16
]
=
{
short
filt16a_l1
[
16
]
=
{
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mm1
[
16
]
=
{
0
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_ml1
[
16
]
=
{
-
4096
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mr1
[
16
]
=
{
0
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
-
4096
,
-
8192
,
0
,
0
,
0
,
0
};
short
filt16a_r1
[
16
]
=
{
short
filt16a_r1
[
16
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
24576
,
0
,
0
,
0
,
0
};
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
24576
,
0
,
0
,
0
,
0
};
...
@@ -41,6 +53,15 @@ short filt16a_m1[16] = {
...
@@ -41,6 +53,15 @@ short filt16a_m1[16] = {
short
filt16a_l2
[
16
]
=
{
short
filt16a_l2
[
16
]
=
{
24576
,
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
24576
,
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mm2
[
16
]
=
{
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_ml2
[
16
]
=
{
-
8192
,
-
4096
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mr2
[
16
]
=
{
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
-
4096
,
0
,
0
,
0
,
0
};
short
filt16a_r2
[
16
]
=
{
short
filt16a_r2
[
16
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
0
,
0
,
0
,
0
};
0
,
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
20480
,
0
,
0
,
0
,
0
};
...
@@ -50,6 +71,12 @@ short filt16a_m2[16] = {
...
@@ -50,6 +71,12 @@ short filt16a_m2[16] = {
short
filt16a_l3
[
16
]
=
{
short
filt16a_l3
[
16
]
=
{
28672
,
24576
,
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
28672
,
24576
,
20480
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_mm3
[
16
]
=
{
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_ml3
[
16
]
=
{
-
12288
,
-
8192
,
-
4096
,
0
,
4096
,
8192
,
12288
,
16384
,
12288
,
8192
,
4096
,
0
,
0
,
0
,
0
,
0
};
short
filt16a_r3
[
16
]
=
{
short
filt16a_r3
[
16
]
=
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
0
,
0
,
0
,
0
};
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
4096
,
8192
,
12288
,
16384
,
0
,
0
,
0
,
0
};
...
@@ -148,7 +175,7 @@ short filt8_dcr0_h[8]= {
...
@@ -148,7 +175,7 @@ short filt8_dcr0_h[8]= {
0
,
4096
,
8192
,
12288
,
16384
,
0
,
0
,
0
};
0
,
4096
,
8192
,
12288
,
16384
,
0
,
0
,
0
};
short
filt8_l1
[
8
]
=
{
short
filt8_l1
[
8
]
=
{
24576
,
16384
,
0
,
0
,
0
,
0
,
0
,
0
};
24576
,
16384
,
8192
,
0
,
0
,
0
,
0
,
0
};
short
filt8_ml1
[
8
]
=
{
short
filt8_ml1
[
8
]
=
{
-
8192
,
0
,
8192
,
16384
,
8192
,
0
,
0
,
0
};
-
8192
,
0
,
8192
,
16384
,
8192
,
0
,
0
,
0
};
...
...
openair1/PHY/NR_UE_ESTIMATION/filt16a_32.h
View file @
d79a38bf
...
@@ -28,24 +28,42 @@ extern short filt16a_r0[16];
...
@@ -28,24 +28,42 @@ extern short filt16a_r0[16];
extern
short
filt16a_m0
[
16
];
extern
short
filt16a_m0
[
16
];
extern
short
filt16a_mm0
[
16
];
extern
short
filt16a_l1
[
16
];
extern
short
filt16a_l1
[
16
];
extern
short
filt16a_r1
[
16
];
extern
short
filt16a_r1
[
16
];
extern
short
filt16a_m1
[
16
];
extern
short
filt16a_m1
[
16
];
extern
short
filt16a_mm1
[
16
];
extern
short
filt16a_mr1
[
16
];
extern
short
filt16a_ml1
[
16
];
extern
short
filt16a_l2
[
16
];
extern
short
filt16a_l2
[
16
];
extern
short
filt16a_r2
[
16
];
extern
short
filt16a_r2
[
16
];
extern
short
filt16a_m2
[
16
];
extern
short
filt16a_m2
[
16
];
extern
short
filt16a_mm2
[
16
];
extern
short
filt16a_mr2
[
16
];
extern
short
filt16a_ml2
[
16
];
extern
short
filt16a_l3
[
16
];
extern
short
filt16a_l3
[
16
];
extern
short
filt16a_r3
[
16
];
extern
short
filt16a_r3
[
16
];
extern
short
filt16a_m3
[
16
];
extern
short
filt16a_m3
[
16
];
extern
short
filt16a_mm3
[
16
];
extern
short
filt16a_ml3
[
16
];
extern
short
filt16a_l0_dc
[
16
];
extern
short
filt16a_l0_dc
[
16
];
extern
short
filt16a_r0_dc
[
16
];
extern
short
filt16a_r0_dc
[
16
];
...
...
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
View file @
d79a38bf
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_nr_UE.h
View file @
d79a38bf
...
@@ -824,6 +824,8 @@ typedef struct {
...
@@ -824,6 +824,8 @@ typedef struct {
NR_UE_DLSCH_t
*
dlsch_p
[
NUMBER_OF_CONNECTED_gNB_MAX
];
NR_UE_DLSCH_t
*
dlsch_p
[
NUMBER_OF_CONNECTED_gNB_MAX
];
NR_UE_DLSCH_t
*
dlsch_MCH
[
NUMBER_OF_CONNECTED_gNB_MAX
];
NR_UE_DLSCH_t
*
dlsch_MCH
[
NUMBER_OF_CONNECTED_gNB_MAX
];
prs_data_t
prs_cfg
;
prs_data_t
prs_cfg
;
int32_t
**
prs_ch_estimates
;
int32_t
**
prs_ch_estimates_time
;
//Paging parameters
//Paging parameters
uint32_t
IMSImod1024
;
uint32_t
IMSImod1024
;
...
@@ -846,7 +848,6 @@ typedef struct {
...
@@ -846,7 +848,6 @@ typedef struct {
#endif
#endif
int32_t
**
prs_ch_estimates
;
/// PBCH DMRS sequence
/// PBCH DMRS sequence
uint32_t
nr_gold_pbch
[
2
][
64
][
NR_PBCH_DMRS_LENGTH_DWORD
];
uint32_t
nr_gold_pbch
[
2
][
64
][
NR_PBCH_DMRS_LENGTH_DWORD
];
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
d79a38bf
...
@@ -105,7 +105,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_
...
@@ -105,7 +105,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame,int slot,nfapi_nr_
prs_data
.
PRSResourceSetPeriod
[
0
]
=
40
;
// PRS resource slot period
prs_data
.
PRSResourceSetPeriod
[
0
]
=
40
;
// PRS resource slot period
prs_data
.
PRSResourceSetPeriod
[
1
]
=
0
;
// resource slot offset
prs_data
.
PRSResourceSetPeriod
[
1
]
=
0
;
// resource slot offset
prs_data
.
SymbolStart
=
7
;
prs_data
.
SymbolStart
=
7
;
prs_data
.
NumPRSSymbols
=
6
;
prs_data
.
NumPRSSymbols
=
4
;
prs_data
.
NumRB
=
fp
->
N_RB_DL
;
prs_data
.
NumRB
=
fp
->
N_RB_DL
;
prs_data
.
RBOffset
=
0
;
prs_data
.
RBOffset
=
0
;
prs_data
.
CombSize
=
4
;
prs_data
.
CombSize
=
4
;
...
...
openair1/SIMULATION/NR_PHY/pbchsim.c
View file @
d79a38bf
...
@@ -739,7 +739,7 @@ int main(int argc, char **argv)
...
@@ -739,7 +739,7 @@ int main(int argc, char **argv)
UE
->
prs_cfg
.
PRSResourceSetPeriod
[
0
]
=
40
;
// PRS resource slot period
UE
->
prs_cfg
.
PRSResourceSetPeriod
[
0
]
=
40
;
// PRS resource slot period
UE
->
prs_cfg
.
PRSResourceSetPeriod
[
1
]
=
0
;
// resource slot offset
UE
->
prs_cfg
.
PRSResourceSetPeriod
[
1
]
=
0
;
// resource slot offset
UE
->
prs_cfg
.
SymbolStart
=
7
;
UE
->
prs_cfg
.
SymbolStart
=
7
;
UE
->
prs_cfg
.
NumPRSSymbols
=
6
;
UE
->
prs_cfg
.
NumPRSSymbols
=
4
;
UE
->
prs_cfg
.
NumRB
=
273
;
UE
->
prs_cfg
.
NumRB
=
273
;
UE
->
prs_cfg
.
RBOffset
=
0
;
UE
->
prs_cfg
.
RBOffset
=
0
;
UE
->
prs_cfg
.
CombSize
=
4
;
UE
->
prs_cfg
.
CombSize
=
4
;
...
...
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