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
canghaiwuhen
OpenXG-RAN
Commits
34c238c3
Commit
34c238c3
authored
Oct 22, 2020
by
Raju
Committed by
kn.raju
Nov 30, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge conflicts resolved
parent
ce2d9fe0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
39 deletions
+18
-39
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+18
-39
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
34c238c3
...
@@ -751,33 +751,16 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -751,33 +751,16 @@ void nr_generate_Msg2(module_id_t module_idP,
"downlinkBWP_ToAddModList has %d BWP!
\n
"
,
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
count
);
"downlinkBWP_ToAddModList has %d BWP!
\n
"
,
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
count
);
NR_BWP_Downlink_t
*
bwp
=
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
ra
->
bwp_id
-
1
];
NR_BWP_Downlink_t
*
bwp
=
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
downlinkBWP_ToAddModList
->
list
.
array
[
ra
->
bwp_id
-
1
];
NR_BWP_Uplink_t
*
ubwp
=
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
ra
->
bwp_id
-
1
];
NR_BWP_Uplink_t
*
ubwp
=
ra
->
secondaryCellGroup
->
spCellConfig
->
spCellConfigDedicated
->
uplinkConfig
->
uplinkBWP_ToAddModList
->
list
.
array
[
ra
->
bwp_id
-
1
];
#endif
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
);
NR_ControlResourceSet_t
*
coreset
=
get_coreset
(
bwp
,
ss
,
0
/* common */
);
NR_ControlResourceSet_t
*
coreset
=
get_coreset
(
bwp
,
ss
,
0
/* common */
);
int
CCEIndex
=
allocate_nr_CCEs
(
nr_mac
,
bwp
,
coreset
,
aggregation_level
,
0
,
// Y
0
,
// m
nr_of_candidates
);
if
(
CCEIndex
<
0
)
{
LOG_E
(
MAC
,
"%s(): cannot find free CCE for RA RNTI %04x!
\n
"
,
__func__
,
ra
->
rnti
);
return
;
}
nr_configure_pdcch
(
nr_mac
,
nr_configure_pdcch
(
nr_mac
,
pdcch_pdu_rel15
,
pdcch_pdu_rel15
,
ra
->
RA_rnti
,
ra
->
RA_rnti
,
ss
,
ss
,
coreset
,
coreset
,
scc
,
scc
,
bwp
,
bwp
);
aggregation_level
,
CCEIndex
);
dl_req
->
nPDUs
+=
1
;
//Adding PDCCH pdu count
dl_req
->
nPDUs
+=
1
;
//Adding PDCCH pdu count
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
i
++
)
{
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
i
++
)
{
...
@@ -790,7 +773,6 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -790,7 +773,6 @@ void nr_generate_Msg2(module_id_t module_idP,
// check if UE is doing RA on CORESET0 , InitialBWP or configured BWP from SCD
// check if UE is doing RA on CORESET0 , InitialBWP or configured BWP from SCD
// get the BW of the PDCCH for PDCCH size and RAR PDSCH size
// get the BW of the PDCCH for PDCCH size and RAR PDSCH size
if
(
ra
->
coreset0_configured
==
1
)
{
if
(
ra
->
coreset0_configured
==
1
)
{
AssertFatal
(
1
==
0
,
"This is a standalone condition
\n
"
);
AssertFatal
(
1
==
0
,
"This is a standalone condition
\n
"
);
}
}
...
@@ -827,7 +809,6 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -827,7 +809,6 @@ void nr_generate_Msg2(module_id_t module_idP,
pdsch_pdu_rel15
->
rnti
=
RA_rnti
;
pdsch_pdu_rel15
->
rnti
=
RA_rnti
;
pdsch_pdu_rel15
->
pduIndex
=
0
;
pdsch_pdu_rel15
->
pduIndex
=
0
;
pdsch_pdu_rel15
->
BWPSize
=
NRRIV2BW
(
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
,
275
);
pdsch_pdu_rel15
->
BWPSize
=
NRRIV2BW
(
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
,
275
);
pdsch_pdu_rel15
->
BWPStart
=
NRRIV2PRBOFFSET
(
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
,
275
);
pdsch_pdu_rel15
->
BWPStart
=
NRRIV2PRBOFFSET
(
bwp
->
bwp_Common
->
genericParameters
.
locationAndBandwidth
,
275
);
pdsch_pdu_rel15
->
SubcarrierSpacing
=
bwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
pdsch_pdu_rel15
->
SubcarrierSpacing
=
bwp
->
bwp_Common
->
genericParameters
.
subcarrierSpacing
;
...
@@ -880,15 +861,13 @@ void nr_generate_Msg2(module_id_t module_idP,
...
@@ -880,15 +861,13 @@ void nr_generate_Msg2(module_id_t module_idP,
pdsch_pdu_rel15
->
precodingAndBeamforming
.
PMIdx
[
0
]
=
0
;
pdsch_pdu_rel15
->
precodingAndBeamforming
.
PMIdx
[
0
]
=
0
;
pdsch_pdu_rel15
->
precodingAndBeamforming
.
beamIdx
[
0
]
=
ra
->
beam_id
;
pdsch_pdu_rel15
->
precodingAndBeamforming
.
beamIdx
[
0
]
=
ra
->
beam_id
;
uint8_t
nr_of_candidates
,
aggregation_level
;
find_aggregation_candidates
(
&
aggregation_level
,
&
nr_of_candidates
,
ss
);
NR_ControlResourceSet_t
*
coreset
=
get_coreset
(
bwp
,
ss
,
0
/* common */
);
int
CCEIndex
=
allocate_nr_CCEs
(
nr_mac
,
int
CCEIndex
=
allocate_nr_CCEs
(
nr_mac
,
bwp
,
bwp
,
coreset
,
coreset
,
aggregation_level
,
aggregation_level
,
0
,
/* n_RNTI 0: common search space */
0
,
// Y
0
);
// m
0
,
// m
nr_of_candidates
);
if
(
CCEIndex
<
0
)
{
if
(
CCEIndex
<
0
)
{
LOG_E
(
MAC
,
"%s(): cannot find free CCE for RA RNTI %04x!
\n
"
,
__func__
,
ra
->
rnti
);
LOG_E
(
MAC
,
"%s(): cannot find free CCE for RA RNTI %04x!
\n
"
,
__func__
,
ra
->
rnti
);
...
...
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