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
89c1a9c2
Commit
89c1a9c2
authored
Feb 12, 2021
by
guhan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed SR
parent
6505729a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
26 deletions
+0
-26
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+0
-22
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+0
-4
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
89c1a9c2
...
@@ -1058,13 +1058,6 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
...
@@ -1058,13 +1058,6 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
uci_01
->
ul_cqi
,
uci_01
->
ul_cqi
,
30
);
30
);
if
(
uci_01
->
pduBitmap
&
0x01
)
{
if
(
uci_01
->
sr
->
sr_indication
&&
!
(
uci_01
->
sr
->
sr_confidence_level
))
{
sched_ctrl
->
sr_req
.
nr_of_srs
=
1
;
sched_ctrl
->
sr_req
.
ul_SR
[
0
]
=
1
;
}
}
if
(((
uci_01
->
pduBitmap
>>
1
)
&
0x01
))
{
if
(((
uci_01
->
pduBitmap
>>
1
)
&
0x01
))
{
nr_rx_acknack
(
NULL
,
uci_01
,
NULL
,
slot
,
sched_ctrl
,
&
UE_info
->
mac_stats
[
0
]);
nr_rx_acknack
(
NULL
,
uci_01
,
NULL
,
slot
,
sched_ctrl
,
&
UE_info
->
mac_stats
[
0
]);
}
}
...
@@ -1089,23 +1082,8 @@ void handle_nr_uci_pucch_2_3_4(module_id_t mod_id,
...
@@ -1089,23 +1082,8 @@ void handle_nr_uci_pucch_2_3_4(module_id_t mod_id,
uci_234
->
ul_cqi
,
uci_234
->
ul_cqi
,
30
);
30
);
if
(
uci_234
->
pduBitmap
&
0x01
)
{
///Handle SR PDU
uint8_t
sr_id
=
0
;
for
(
sr_id
=
0
;
sr_id
<
uci_234
->
sr
.
sr_bit_len
;
sr_id
++
)
{
sched_ctrl
->
sr_req
.
ul_SR
[
sr_id
]
=
*
(
uci_234
->
sr
.
sr_payload
)
&
1
;
*
(
uci_234
->
sr
.
sr_payload
)
>>=
1
;
}
sched_ctrl
->
sr_req
.
nr_of_srs
=
uci_234
->
sr
.
sr_bit_len
;
}
// TODO
if
((
uci_234
->
pduBitmap
>>
1
)
&
0x01
)
{
if
((
uci_234
->
pduBitmap
>>
1
)
&
0x01
)
{
nr_rx_acknack
(
NULL
,
NULL
,
uci_234
,
slot
,
sched_ctrl
,
&
UE_info
->
mac_stats
[
0
]);
nr_rx_acknack
(
NULL
,
NULL
,
uci_234
,
slot
,
sched_ctrl
,
&
UE_info
->
mac_stats
[
0
]);
}
if
((
uci_234
->
pduBitmap
>>
1
)
&
0x01
)
{
//API to parse the csi report and store it into sched_ctrl
//API to parse the csi report and store it into sched_ctrl
extract_pucch_csi_report
(
csi_MeasConfig
,
uci_234
,
frame
,
slot
,
UE_id
,
mod_id
);
extract_pucch_csi_report
(
csi_MeasConfig
,
uci_234
,
frame
,
slot
,
UE_id
,
mod_id
);
//TCI handling function
//TCI handling function
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
89c1a9c2
...
@@ -406,10 +406,6 @@ struct CSI_Report {
...
@@ -406,10 +406,6 @@ struct CSI_Report {
};
};
#define MAX_SR_BITLEN 8
#define MAX_SR_BITLEN 8
typedef
struct
NR_UE_sr
{
uint8_t
nr_of_srs
;
bool
ul_SR
[
MAX_SR_BITLEN
];
}
NR_UE_sr_t
;
typedef
struct
{
typedef
struct
{
uint8_t
nb_ssbri_cri
;
uint8_t
nb_ssbri_cri
;
...
...
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