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
lizhongxiao
OpenXG-RAN
Commits
a365bde8
Commit
a365bde8
authored
Nov 28, 2020
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor correction: y cannot be zero
parent
a3b633d2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
16 deletions
+16
-16
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+5
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
+3
-6
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
...ENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+8
-8
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
a365bde8
...
@@ -1591,13 +1591,16 @@ void nr_dlsch_channel_level(int **dl_ch_estimates_ext,
...
@@ -1591,13 +1591,16 @@ void nr_dlsch_channel_level(int **dl_ch_estimates_ext,
short
rb
;
short
rb
;
unsigned
char
aatx
,
aarx
;
unsigned
char
aatx
,
aarx
;
__m128i
*
dl_ch128
,
avg128D
;
__m128i
*
dl_ch128
,
avg128D
;
Mi
//nb_rb*nre = y * 2^x
//nb_rb*nre = y * 2^x
int16_t
x
=
factor2
(
len
);
int16_t
x
=
factor2
(
len
);
//x = (x>4) ? 4 : x;
//x = (x>4) ? 4 : x;
int16_t
y
=
(
len
)
>>
x
;
int16_t
y
=
(
len
)
>>
x
;
//printf("len = %d = %d * 2^(%d)\n",len,y,x);
//printf("len = %d = %d * 2^(%d)\n",len,y,x);
// FIXME: y cannot be zero
if
(
y
==
0
)
y
=
1
;
for
(
aatx
=
0
;
aatx
<
frame_parms
->
nb_antenna_ports_gNB
;
aatx
++
)
for
(
aatx
=
0
;
aatx
<
frame_parms
->
nb_antenna_ports_gNB
;
aatx
++
)
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
{
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
{
//clear average level
//clear average level
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
View file @
a365bde8
...
@@ -298,6 +298,8 @@ void schedule_control_sib1(module_id_t module_id,
...
@@ -298,6 +298,8 @@ void schedule_control_sib1(module_id_t module_id,
gNB_mac
->
sched_ctrlCommon
->
rbSize
=
rbSize
;
gNB_mac
->
sched_ctrlCommon
->
rbSize
=
rbSize
;
gNB_mac
->
sched_ctrlCommon
->
rbStart
=
0
;
gNB_mac
->
sched_ctrlCommon
->
rbStart
=
0
;
LOG_I
(
MAC
,
"rbSize = %i
\n
"
,
gNB_mac
->
sched_ctrlCommon
->
rbSize
);
// Mark the corresponding RBs as used
// Mark the corresponding RBs as used
for
(
int
rb
=
0
;
rb
<
gNB_mac
->
sched_ctrlCommon
->
rbSize
;
rb
++
)
{
for
(
int
rb
=
0
;
rb
<
gNB_mac
->
sched_ctrlCommon
->
rbSize
;
rb
++
)
{
vrb_map
[
rb
+
rbStart
]
=
1
;
vrb_map
[
rb
+
rbStart
]
=
1
;
...
@@ -440,7 +442,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
...
@@ -440,7 +442,7 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
// static values
// static values
const
int
CC_id
=
0
;
const
int
CC_id
=
0
;
int
time_domain_allocation
=
2
;
// FIXME: For OAI-UE (2
), For 3rd party implementation and 3GPP compliant (4)
int
time_domain_allocation
=
0
;
// FIXME: For OAI-UE (0-3
), For 3rd party implementation and 3GPP compliant (4)
uint8_t
mcsTableIdx
=
0
;
uint8_t
mcsTableIdx
=
0
;
uint8_t
mcs
=
8
;
uint8_t
mcs
=
8
;
uint8_t
numDmrsCdmGrpsNoData
=
2
;
uint8_t
numDmrsCdmGrpsNoData
=
2
;
...
@@ -474,11 +476,6 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
...
@@ -474,11 +476,6 @@ void schedule_nr_sib1(module_id_t module_idP, frame_t frameP, sub_frame_t slotP)
nr_get_code_rate_dl
(
gNB_mac
->
sched_ctrlCommon
->
mcs
,
gNB_mac
->
sched_ctrlCommon
->
mcsTableIdx
),
nr_get_code_rate_dl
(
gNB_mac
->
sched_ctrlCommon
->
mcs
,
gNB_mac
->
sched_ctrlCommon
->
mcsTableIdx
),
gNB_mac
->
sched_ctrlCommon
->
rbSize
,
nrOfSymbols
,
N_PRB_DMRS
,
0
,
0
,
1
)
>>
3
;
gNB_mac
->
sched_ctrlCommon
->
rbSize
,
nrOfSymbols
,
N_PRB_DMRS
,
0
,
0
,
1
)
>>
3
;
printf
(
"===================================================
\n
"
);
printf
(
"gNB_mac->sched_ctrlCommon->rbSize = %i
\n
"
,
gNB_mac
->
sched_ctrlCommon
->
rbSize
);
printf
(
"===================================================
\n
"
);
nfapi_nr_dl_tti_request_body_t
*
dl_req
=
&
gNB_mac
->
DL_req
[
CC_id
].
dl_tti_request_body
;
nfapi_nr_dl_tti_request_body_t
*
dl_req
=
&
gNB_mac
->
DL_req
[
CC_id
].
dl_tti_request_body
;
nr_fill_nfapi_dl_sib1_pdu
(
module_idP
,
dl_req
,
TBS
,
startSymbolIndex
,
nrOfSymbols
);
nr_fill_nfapi_dl_sib1_pdu
(
module_idP
,
dl_req
,
TBS
,
startSymbolIndex
,
nrOfSymbols
);
...
...
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
View file @
a365bde8
...
@@ -64,23 +64,23 @@ gNBs =
...
@@ -64,23 +64,23 @@ gNBs =
#initialULBWPmappingType
#initialULBWPmappingType
#0=typeA,1=typeB
#0=typeA,1=typeB
initialDLBWPmappingType_0
=
0
;
initialDLBWPmappingType_0
=
0
;
#this is SS=
1,L=13
#this is SS=
2,L=12
initialDLBWPstartSymbolAndLength_0
=
40
;
initialDLBWPstartSymbolAndLength_0
=
53
;
initialDLBWPk0_1
=
0
;
initialDLBWPk0_1
=
0
;
initialDLBWPmappingType_1
=
0
;
initialDLBWPmappingType_1
=
0
;
#this is SS=2,L=1
2
#this is SS=2,L=1
0
initialDLBWPstartSymbolAndLength_1
=
53
;
initialDLBWPstartSymbolAndLength_1
=
81
;
initialDLBWPk0_2
=
0
;
initialDLBWPk0_2
=
0
;
initialDLBWPmappingType_2
=
0
;
initialDLBWPmappingType_2
=
0
;
#this is SS=1,L=12
#this is SS=1,L=12
initialDLBWPstartSymbolAndLength_2
=
54
;
initialDLBWPstartSymbolAndLength_2
=
95
;
initialDLBWPk0_3
=
0
;
initialDLBWPk0_3
=
0
;
initialDLBWPmappingType_3
=
0
;
initialDLBWPmappingType_3
=
0
;
#this is SS=
1,L=5
#this is SS=
2,L=7
initialDLBWPstartSymbolAndLength_3
=
57
;
initialDLBWPstartSymbolAndLength_3
=
86
;
initialDLBWPk0_4
=
0
;
initialDLBWPk0_4
=
0
;
initialDLBWPmappingType_4
=
0
;
initialDLBWPmappingType_4
=
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