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
wangjie
OpenXG-RAN
Commits
a9a5731e
Commit
a9a5731e
authored
Dec 12, 2020
by
Robert Schmidt
Committed by
ChiehChun
Dec 16, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No DCI PDU array in nr_generate_Msg2()
parent
200cd8fb
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
30 deletions
+32
-30
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+32
-30
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
a9a5731e
...
@@ -766,7 +766,7 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -766,7 +766,7 @@ void nr_generate_Msg2(module_id_t module_idP,
sub_frame_t
slotP
)
sub_frame_t
slotP
)
{
{
int
dci_formats
[
2
],
rnti_types
[
2
],
mcsIndex
;
int
mcsIndex
;
int
startSymbolAndLength
=
0
,
StartSymbolIndex
=
-
1
,
NrOfSymbols
=
14
,
StartSymbolIndex_tmp
,
NrOfSymbols_tmp
,
x_Overhead
,
time_domain_assignment
=
0
;
int
startSymbolAndLength
=
0
,
StartSymbolIndex
=
-
1
,
NrOfSymbols
=
14
,
StartSymbolIndex_tmp
,
NrOfSymbols_tmp
,
x_Overhead
,
time_domain_assignment
=
0
;
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
gNB_MAC_INST
*
nr_mac
=
RC
.
nrmac
[
module_idP
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
NR_COMMON_channels_t
*
cc
=
&
nr_mac
->
common_channels
[
CC_id
];
...
@@ -887,23 +887,24 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -887,23 +887,24 @@ void nr_generate_Msg2(module_id_t module_idP,
pdsch_pdu_rel15
->
NrOfSymbols
=
NrOfSymbols
;
pdsch_pdu_rel15
->
NrOfSymbols
=
NrOfSymbols
;
pdsch_pdu_rel15
->
dlDmrsSymbPos
=
fill_dmrs_mask
(
NULL
,
scc
->
dmrs_TypeA_Position
,
NrOfSymbols
);
pdsch_pdu_rel15
->
dlDmrsSymbPos
=
fill_dmrs_mask
(
NULL
,
scc
->
dmrs_TypeA_Position
,
NrOfSymbols
);
dci_pdu_rel15_t
dci_pdu_rel15
[
MAX_DCI_CORESET
]
;
dci_pdu_rel15_t
dci_pdu_rel15
;
dci_pdu_rel15
[
0
]
.
frequency_domain_assignment
.
val
=
PRBalloc_to_locationandbandwidth0
(
pdsch_pdu_rel15
->
rbSize
,
dci_pdu_rel15
.
frequency_domain_assignment
.
val
=
PRBalloc_to_locationandbandwidth0
(
pdsch_pdu_rel15
->
rbSize
,
pdsch_pdu_rel15
->
rbStart
,
dci10_bw
);
pdsch_pdu_rel15
->
rbStart
,
dci10_bw
);
dci_pdu_rel15
[
0
].
time_domain_assignment
.
val
=
time_domain_assignment
;
dci_pdu_rel15
.
time_domain_assignment
.
val
=
time_domain_assignment
;
dci_pdu_rel15
[
0
].
vrb_to_prb_mapping
.
val
=
0
;
dci_pdu_rel15
.
vrb_to_prb_mapping
.
val
=
0
;
dci_pdu_rel15
[
0
].
mcs
=
pdsch_pdu_rel15
->
mcsIndex
[
0
];
dci_pdu_rel15
.
mcs
=
pdsch_pdu_rel15
->
mcsIndex
[
0
];
dci_pdu_rel15
[
0
].
tb_scaling
=
0
;
dci_pdu_rel15
.
tb_scaling
=
0
;
LOG_I
(
MAC
,
"[RAPROC] DCI type 1 payload: freq_alloc %d (%d,%d,%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d
\n
"
,
LOG_I
(
MAC
,
dci_pdu_rel15
[
0
].
frequency_domain_assignment
.
val
,
"[RAPROC] DCI type 1 payload: freq_alloc %d (%d,%d,%d), time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d
\n
"
,
dci_pdu_rel15
.
frequency_domain_assignment
.
val
,
pdsch_pdu_rel15
->
rbStart
,
pdsch_pdu_rel15
->
rbStart
,
pdsch_pdu_rel15
->
rbSize
,
pdsch_pdu_rel15
->
rbSize
,
dci10_bw
,
dci10_bw
,
dci_pdu_rel15
[
0
]
.
time_domain_assignment
.
val
,
dci_pdu_rel15
.
time_domain_assignment
.
val
,
dci_pdu_rel15
[
0
]
.
vrb_to_prb_mapping
.
val
,
dci_pdu_rel15
.
vrb_to_prb_mapping
.
val
,
dci_pdu_rel15
[
0
]
.
mcs
,
dci_pdu_rel15
.
mcs
,
dci_pdu_rel15
[
0
]
.
tb_scaling
);
dci_pdu_rel15
.
tb_scaling
);
uint8_t
nr_of_candidates
,
aggregation_level
;
uint8_t
nr_of_candidates
,
aggregation_level
;
find_aggregation_candidates
(
&
aggregation_level
,
&
nr_of_candidates
,
ss
);
find_aggregation_candidates
(
&
aggregation_level
,
&
nr_of_candidates
,
ss
);
...
@@ -932,13 +933,14 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -932,13 +933,14 @@ void nr_generate_Msg2(module_id_t module_idP,
LOG_I
(
MAC
,
"Frame %d: Subframe %d : Adding common DL DCI for RA_RNTI %x
\n
"
,
frameP
,
slotP
,
RA_rnti
);
LOG_I
(
MAC
,
"Frame %d: Subframe %d : Adding common DL DCI for RA_RNTI %x
\n
"
,
frameP
,
slotP
,
RA_rnti
);
dci_formats
[
0
]
=
NR_DL_DCI_FORMAT_1_0
;
const
int
dci_format
=
NR_DL_DCI_FORMAT_1_0
;
rnti_types
[
0
]
=
NR_RNTI_RA
;
const
int
rnti_type
=
NR_RNTI_RA
;
LOG_I
(
MAC
,
"[RAPROC] DCI params: rnti %d, rnti_type %d, dci_format %d coreset params: FreqDomainResource %llx, start_symbol %d n_symb %d
\n
"
,
LOG_I
(
MAC
,
"[RAPROC] DCI params: rnti %d, rnti_type %d, dci_format %d coreset params: FreqDomainResource %llx, start_symbol %d n_symb %d
\n
"
,
pdcch_pdu_rel15
->
dci_pdu
[
0
].
RNTI
,
pdcch_pdu_rel15
->
dci_pdu
[
0
].
RNTI
,
rnti_types
[
0
]
,
rnti_type
,
dci_formats
[
0
]
,
dci_format
,
(
unsigned
long
long
)
pdcch_pdu_rel15
->
FreqDomainResource
,
(
unsigned
long
long
)
pdcch_pdu_rel15
->
FreqDomainResource
,
pdcch_pdu_rel15
->
StartSymbolIndex
,
pdcch_pdu_rel15
->
StartSymbolIndex
,
pdcch_pdu_rel15
->
DurationSymbols
);
pdcch_pdu_rel15
->
DurationSymbols
);
...
@@ -947,9 +949,9 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -947,9 +949,9 @@ void nr_generate_Msg2(module_id_t module_idP,
fill_dci_pdu_rel15
(
scc
,
fill_dci_pdu_rel15
(
scc
,
ra
->
secondaryCellGroup
,
ra
->
secondaryCellGroup
,
&
pdcch_pdu_rel15
->
dci_pdu
[
pdcch_pdu_rel15
->
numDlDci
-
1
],
&
pdcch_pdu_rel15
->
dci_pdu
[
pdcch_pdu_rel15
->
numDlDci
-
1
],
&
dci_pdu_rel15
[
0
]
,
&
dci_pdu_rel15
,
dci_format
s
[
0
]
,
dci_format
,
rnti_type
s
[
0
]
,
rnti_type
,
dci10_bw
,
dci10_bw
,
ra
->
bwp_id
);
ra
->
bwp_id
);
...
@@ -963,7 +965,7 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -963,7 +965,7 @@ void nr_generate_Msg2(module_id_t module_idP,
LOG_I
(
MAC
,
"[gNB %d][RAPROC] Frame %d, Subframe %d: RA state %d
\n
"
,
module_idP
,
frameP
,
slotP
,
ra
->
state
);
LOG_I
(
MAC
,
"[gNB %d][RAPROC] Frame %d, Subframe %d: RA state %d
\n
"
,
module_idP
,
frameP
,
slotP
,
ra
->
state
);
x_Overhead
=
0
;
x_Overhead
=
0
;
nr_get_tbs_dl
(
&
dl_tti_pdsch_pdu
->
pdsch_pdu
,
x_Overhead
,
pdsch_pdu_rel15
->
numDmrsCdmGrpsNoData
,
dci_pdu_rel15
[
0
]
.
tb_scaling
);
nr_get_tbs_dl
(
&
dl_tti_pdsch_pdu
->
pdsch_pdu
,
x_Overhead
,
pdsch_pdu_rel15
->
numDmrsCdmGrpsNoData
,
dci_pdu_rel15
.
tb_scaling
);
// DL TX request
// DL TX request
tx_req
->
PDU_length
=
pdsch_pdu_rel15
->
TBSize
[
0
];
tx_req
->
PDU_length
=
pdsch_pdu_rel15
->
TBSize
[
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