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
zzha zzha
OpenXG-RAN
Commits
1b2a64fe
Commit
1b2a64fe
authored
Aug 21, 2023
by
maaroufi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed white spaces
parent
01c1eba4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
8 deletions
+4
-8
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+0
-1
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+1
-4
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
1b2a64fe
...
...
@@ -820,7 +820,6 @@ int phy_nr_uci_indication(nfapi_nr_uci_indication_t *ind)
{
if
(
uci_ind
->
uci_list
[
i
].
pdu_type
==
NFAPI_NR_UCI_FORMAT_0_1_PDU_TYPE
)
{
}
if
(
uci_ind
->
uci_list
[
i
].
pdu_type
==
NFAPI_NR_UCI_FORMAT_2_3_4_PDU_TYPE
)
{
...
...
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
1b2a64fe
...
...
@@ -6076,20 +6076,20 @@ static uint8_t unpack_nr_uci_pucch_0_1(nfapi_nr_uci_pucch_pdu_format_0_1_t *valu
return
0
;
if
(
value
->
pduBitmap
&
0x01
)
{
//SR
if
(
!
(
pull8
(
ppReadPackedMsg
,
&
value
->
sr
.
sr_indication
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
sr
.
sr_confidence_level
,
end
)
pull8
(
ppReadPackedMsg
,
&
value
->
sr
.
sr_confidence_level
,
end
)
))
return
0
;
}
if
(((
value
->
pduBitmap
>>
1
)
&
0x01
))
{
//HARQ
if
(
!
(
pull8
(
ppReadPackedMsg
,
&
value
->
harq
.
num_harq
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
value
->
harq
.
harq_confidence_level
,
end
)
))
return
0
;
if
(
value
->
harq
.
num_harq
>
0
)
{
for
(
int
i
=
0
;
i
<
value
->
harq
.
num_harq
;
i
++
)
{
if
(
!
pull8
(
ppReadPackedMsg
,
&
value
->
harq
.
harq_list
[
i
].
harq_value
,
end
))
{
return
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
1b2a64fe
...
...
@@ -960,9 +960,6 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
else
sched_ctrl
->
tpc1
=
3
;
sched_ctrl
->
pucch_snrx10
=
uci_01
->
ul_cqi
*
5
-
640
;
}
// check scheduling request result, confidence_level == 0 is good
...
...
@@ -972,7 +969,7 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
sched_ctrl
->
SR
|=
true
;
LOG_D
(
NR_MAC
,
"SR UE %04x ul_cqi %d
\n
"
,
uci_01
->
rnti
,
uci_01
->
ul_cqi
);
}
}
NR_SCHED_UNLOCK
(
&
nrmac
->
sched_lock
);
}
...
...
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