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
f2f6850b
Commit
f2f6850b
authored
Dec 15, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
first version to check pucch vrb occupation
parent
909f0ad4
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
181 additions
and
63 deletions
+181
-63
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+37
-10
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+136
-53
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+8
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
f2f6850b
...
@@ -1035,23 +1035,26 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
...
@@ -1035,23 +1035,26 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
else
{
// this is the default PUCCH configuration, PUCCH format 0 or 1
else
{
// this is the default PUCCH configuration, PUCCH format 0 or 1
LOG_D
(
NR_MAC
,
"pucch_acknak: Filling default PUCCH configuration from Tables (r_pucch %d, bwp %p)
\n
"
,
r_pucch
,
bwp
);
LOG_D
(
NR_MAC
,
"pucch_acknak: Filling default PUCCH configuration from Tables (r_pucch %d, bwp %p)
\n
"
,
r_pucch
,
bwp
);
int
rsetindex
=
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
pucch_ResourceCommon
;
int
rsetindex
=
*
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
pucch_ConfigCommon
->
choice
.
setup
->
pucch_ResourceCommon
;
int
prboffset
=
r_pucch
/
default_pucch_csset
[
rsetindex
];
int
prb_start
,
second_hop_prb
,
nr_of_symb
,
start_symb
;
int
prboffsetm8
=
(
r_pucch
-
8
)
/
default_pucch_csset
[
rsetindex
];
set_r_pucch_parms
(
rsetindex
,
pucch_pdu
->
prb_start
=
(
r_pucch
>>
3
)
==
0
?
r_pucch
,
default_pucch_prboffset
[
rsetindex
]
+
prboffset
:
pucch_pdu
->
bwp_size
,
pucch_pdu
->
bwp_size
-
1
-
default_pucch_prboffset
[
rsetindex
]
-
prboffsetm8
;
&
prb_start
,
&
second_hop_prb
,
&
nr_of_symb
,
&
start_symb
);
pucch_pdu
->
prb_start
=
prb_start
;
pucch_pdu
->
rnti
=
rnti
;
pucch_pdu
->
rnti
=
rnti
;
pucch_pdu
->
freq_hop_flag
=
1
;
pucch_pdu
->
freq_hop_flag
=
1
;
pucch_pdu
->
second_hop_prb
=
(
r_pucch
>>
3
)
==
0
?
pucch_pdu
->
second_hop_prb
=
second_hop_prb
;
pucch_pdu
->
bwp_size
-
1
-
default_pucch_prboffset
[
rsetindex
]
-
prboffset
:
default_pucch_prboffset
[
rsetindex
]
+
prboffsetm8
;
pucch_pdu
->
format_type
=
default_pucch_fmt
[
rsetindex
];
pucch_pdu
->
format_type
=
default_pucch_fmt
[
rsetindex
];
pucch_pdu
->
initial_cyclic_shift
=
r_pucch
%
default_pucch_csset
[
rsetindex
];
pucch_pdu
->
initial_cyclic_shift
=
r_pucch
%
default_pucch_csset
[
rsetindex
];
if
(
rsetindex
==
3
||
rsetindex
==
7
||
rsetindex
==
11
)
pucch_pdu
->
initial_cyclic_shift
*=
6
;
if
(
rsetindex
==
3
||
rsetindex
==
7
||
rsetindex
==
11
)
pucch_pdu
->
initial_cyclic_shift
*=
6
;
else
if
(
rsetindex
==
1
||
rsetindex
==
2
)
pucch_pdu
->
initial_cyclic_shift
*=
3
;
else
if
(
rsetindex
==
1
||
rsetindex
==
2
)
pucch_pdu
->
initial_cyclic_shift
*=
3
;
else
pucch_pdu
->
initial_cyclic_shift
*=
4
;
else
pucch_pdu
->
initial_cyclic_shift
*=
4
;
pucch_pdu
->
nr_of_symbols
=
default_pucch_numbsymb
[
rsetindex
]
;
pucch_pdu
->
nr_of_symbols
=
nr_of_symb
;
pucch_pdu
->
start_symbol_index
=
default_pucch_firstsymb
[
rsetindex
]
;
pucch_pdu
->
start_symbol_index
=
start_symb
;
if
(
pucch_pdu
->
format_type
==
1
)
pucch_pdu
->
time_domain_occ_idx
=
0
;
// check this!!
if
(
pucch_pdu
->
format_type
==
1
)
pucch_pdu
->
time_domain_occ_idx
=
0
;
// check this!!
pucch_pdu
->
sr_flag
=
O_sr
;
pucch_pdu
->
sr_flag
=
O_sr
;
pucch_pdu
->
prb_size
=
1
;
pucch_pdu
->
prb_size
=
1
;
...
@@ -1059,6 +1062,30 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
...
@@ -1059,6 +1062,30 @@ void nr_configure_pucch(nfapi_nr_pucch_pdu_t* pucch_pdu,
}
}
void
set_r_pucch_parms
(
int
rsetindex
,
int
r_pucch
,
int
bwp_size
,
int
*
prb_start
,
int
*
second_hop_prb
,
int
*
nr_of_symbols
,
int
*
start_symbol_index
)
{
int
prboffset
=
r_pucch
/
default_pucch_csset
[
rsetindex
];
int
prboffsetm8
=
(
r_pucch
-
8
)
/
default_pucch_csset
[
rsetindex
];
*
prb_start
=
(
r_pucch
>>
3
)
==
0
?
default_pucch_prboffset
[
rsetindex
]
+
prboffset
:
bwp_size
-
1
-
default_pucch_prboffset
[
rsetindex
]
-
prboffsetm8
;
*
second_hop_prb
=
(
r_pucch
>>
3
)
==
0
?
bwp_size
-
1
-
default_pucch_prboffset
[
rsetindex
]
-
prboffset
:
default_pucch_prboffset
[
rsetindex
]
+
prboffsetm8
;
*
nr_of_symbols
=
default_pucch_numbsymb
[
rsetindex
];
*
start_symbol_index
=
default_pucch_firstsymb
[
rsetindex
];
}
void
prepare_dci
(
const
NR_CellGroupConfig_t
*
CellGroup
,
void
prepare_dci
(
const
NR_CellGroupConfig_t
*
CellGroup
,
dci_pdu_rel15_t
*
dci_pdu_rel15
,
dci_pdu_rel15_t
*
dci_pdu_rel15
,
nr_dci_format_t
format
,
nr_dci_format_t
format
,
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
f2f6850b
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
f2f6850b
...
@@ -270,6 +270,14 @@ void prepare_dci(const NR_CellGroupConfig_t *CellGroup,
...
@@ -270,6 +270,14 @@ void prepare_dci(const NR_CellGroupConfig_t *CellGroup,
nr_dci_format_t
format
,
nr_dci_format_t
format
,
int
bwp_id
);
int
bwp_id
);
void
set_r_pucch_parms
(
int
rsetindex
,
int
r_pucch
,
int
bwp_size
,
int
*
prb_start
,
int
*
second_hop_prb
,
int
*
nr_of_symbols
,
int
*
start_symbol_index
);
/* find coreset within the search space */
/* find coreset within the search space */
NR_ControlResourceSet_t
*
get_coreset
(
module_id_t
module_idP
,
NR_ControlResourceSet_t
*
get_coreset
(
module_id_t
module_idP
,
NR_ServingCellConfigCommon_t
*
scc
,
NR_ServingCellConfigCommon_t
*
scc
,
...
...
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