Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
25689237
Commit
25689237
authored
Nov 11, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some fixes
parent
0708c8a9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
13 deletions
+16
-13
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+1
-0
openair1/PHY/INIT/nr_init_ru.c
openair1/PHY/INIT/nr_init_ru.c
+3
-1
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+10
-10
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+2
-2
No files found.
openair1/PHY/INIT/nr_init.c
View file @
25689237
...
...
@@ -215,6 +215,7 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
i
,
common_vars
->
txdataF
[
i
],
fp
->
samples_per_frame_wCP
*
sizeof
(
int32_t
));
common_vars
->
beam_id
[
i
]
=
(
uint8_t
*
)
malloc16_clear
(
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
*
sizeof
(
uint8_t
));
memset
(
common_vars
->
beam_id
[
i
],
255
,
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
);
}
for
(
i
=
0
;
i
<
Prx
;
i
++
){
common_vars
->
rxdataF
[
i
]
=
(
int32_t
*
)
malloc16_clear
(
fp
->
samples_per_frame_wCP
*
sizeof
(
int32_t
));
...
...
openair1/PHY/INIT/nr_init_ru.c
View file @
25689237
...
...
@@ -148,8 +148,10 @@ int nr_phy_init_RU(RU_t *ru) {
}
ru
->
common
.
beam_id
=
(
uint8_t
**
)
malloc16_clear
(
ru
->
nb_tx
*
sizeof
(
uint8_t
*
));
for
(
i
=
0
;
i
<
ru
->
nb_tx
;
++
i
)
for
(
i
=
0
;
i
<
ru
->
nb_tx
;
++
i
)
{
ru
->
common
.
beam_id
[
i
]
=
(
uint8_t
*
)
malloc16_clear
(
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
*
sizeof
(
uint8_t
));
memset
(
ru
->
common
.
beam_id
[
i
],
255
,
fp
->
symbols_per_slot
*
fp
->
slots_per_frame
);
}
}
// !=IF5
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
25689237
...
...
@@ -131,19 +131,19 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
ssb_start_symbol
,
n_hf
,
frame
,
cfg
,
fp
);
}
// SSB beamforming is handled at PHY
// currently our PHY does not support switching more than once a slot.
if
(
ssb_per_slot
>
1
)
{
LOG_W
(
PHY
,
"beamforming currently not supported for more than one SSB per slot
\n
"
);
}
else
if
(
ssb_per_slot
==
1
)
{
LOG_I
(
PHY
,
"slot %d, ssb_index %d, beam %d
\n
"
,
slot
,
ssb_index
,
cfg
->
ssb_table
.
ssb_beam_id_list
[
ssb_index
].
beam_id
.
value
);
for
(
int
j
=
0
;
j
<
fp
->
symbols_per_slot
;
j
++
)
gNB
->
common_vars
.
beam_id
[
0
][
slot
*
fp
->
symbols_per_slot
+
j
]
=
cfg
->
ssb_table
.
ssb_beam_id_list
[
ssb_index
].
beam_id
.
value
;
}
}
}
}
}
void
phy_procedures_gNB_TX
(
PHY_VARS_gNB
*
gNB
,
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
25689237
...
...
@@ -278,7 +278,7 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
int
num_ssb
=
0
;
for
(
int
i
=
0
;
i
<
32
;
i
++
)
{
cfg
->
ssb_table
.
ssb_beam_id_list
[
i
].
beam_id
.
tl
.
tag
=
NFAPI_NR_CONFIG_BEAM_ID_TAG
;
if
((
cfg
->
ssb_table
.
ssb_mask_list
[
0
].
ssb_mask
.
value
>>
i
)
&
1
)
{
if
((
cfg
->
ssb_table
.
ssb_mask_list
[
0
].
ssb_mask
.
value
>>
(
31
-
i
)
)
&
1
)
{
cfg
->
ssb_table
.
ssb_beam_id_list
[
i
].
beam_id
.
value
=
num_ssb
;
num_ssb
++
;
}
...
...
@@ -286,7 +286,7 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
}
for
(
int
i
=
0
;
i
<
32
;
i
++
)
{
cfg
->
ssb_table
.
ssb_beam_id_list
[
32
+
i
].
beam_id
.
tl
.
tag
=
NFAPI_NR_CONFIG_BEAM_ID_TAG
;
if
((
cfg
->
ssb_table
.
ssb_mask_list
[
1
].
ssb_mask
.
value
>>
i
)
&
1
)
{
if
((
cfg
->
ssb_table
.
ssb_mask_list
[
1
].
ssb_mask
.
value
>>
(
31
-
i
)
)
&
1
)
{
cfg
->
ssb_table
.
ssb_beam_id_list
[
32
+
i
].
beam_id
.
value
=
num_ssb
;
num_ssb
++
;
}
...
...
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