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
938f259b
Commit
938f259b
authored
Sep 30, 2022
by
Marwan Hammouda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing unnecessary changes
parent
ba253723
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
21 deletions
+1
-21
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+1
-19
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+0
-2
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
938f259b
...
@@ -38,8 +38,6 @@
...
@@ -38,8 +38,6 @@
#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
#include "LAYER2/NR_MAC_COMMON/nr_mac_extern.h"
//#define SRS_IND_DEBUG
//#define SRS_IND_DEBUG
static
int
nofBlocks
=
0
;
static
int
nofErrors
=
0
;
int
get_dci_format
(
NR_UE_sched_ctrl_t
*
sched_ctrl
)
{
int
get_dci_format
(
NR_UE_sched_ctrl_t
*
sched_ctrl
)
{
...
@@ -436,8 +434,6 @@ int nr_process_mac_pdu(instance_t module_idP,
...
@@ -436,8 +434,6 @@ int nr_process_mac_pdu(instance_t module_idP,
void
abort_nr_ul_harq
(
NR_UE_info_t
*
UE
,
int8_t
harq_pid
)
void
abort_nr_ul_harq
(
NR_UE_info_t
*
UE
,
int8_t
harq_pid
)
{
{
nofErrors
++
;
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
NR_UE_sched_ctrl_t
*
sched_ctrl
=
&
UE
->
UE_sched_ctrl
;
NR_UE_ul_harq_t
*
harq
=
&
sched_ctrl
->
ul_harq_processes
[
harq_pid
];
NR_UE_ul_harq_t
*
harq
=
&
sched_ctrl
->
ul_harq_processes
[
harq_pid
];
...
@@ -453,16 +449,6 @@ void abort_nr_ul_harq(NR_UE_info_t *UE, int8_t harq_pid)
...
@@ -453,16 +449,6 @@ void abort_nr_ul_harq(NR_UE_info_t *UE, int8_t harq_pid)
sched_ctrl
->
sched_ul_bytes
=
0
;
sched_ctrl
->
sched_ul_bytes
=
0
;
}
}
float
returnULBLER
(
void
)
{
float
BLER
=
(
float
)
nofErrors
/
(
float
)
nofBlocks
;
nofErrors
=
0
;
nofBlocks
=
0
;
return
BLER
;
}
void
handle_nr_ul_harq
(
const
int
CC_idP
,
void
handle_nr_ul_harq
(
const
int
CC_idP
,
module_id_t
mod_id
,
module_id_t
mod_id
,
frame_t
frame
,
frame_t
frame
,
...
@@ -512,7 +498,6 @@ void handle_nr_ul_harq(const int CC_idP,
...
@@ -512,7 +498,6 @@ void handle_nr_ul_harq(const int CC_idP,
harq
->
feedback_slot
=
-
1
;
harq
->
feedback_slot
=
-
1
;
harq
->
is_waiting
=
false
;
harq
->
is_waiting
=
false
;
if
(
!
crc_pdu
->
tb_crc_status
)
{
if
(
!
crc_pdu
->
tb_crc_status
)
{
nofBlocks
++
;
harq
->
ndi
^=
1
;
harq
->
ndi
^=
1
;
harq
->
round
=
0
;
harq
->
round
=
0
;
LOG_D
(
NR_MAC
,
LOG_D
(
NR_MAC
,
...
@@ -521,10 +506,7 @@ void handle_nr_ul_harq(const int CC_idP,
...
@@ -521,10 +506,7 @@ void handle_nr_ul_harq(const int CC_idP,
crc_pdu
->
rnti
);
crc_pdu
->
rnti
);
add_tail_nr_list
(
&
sched_ctrl
->
available_ul_harq
,
harq_pid
);
add_tail_nr_list
(
&
sched_ctrl
->
available_ul_harq
,
harq_pid
);
}
else
if
(
harq
->
round
>=
RC
.
nrmac
[
mod_id
]
->
ul_bler
.
harq_round_max
-
1
)
{
}
else
if
(
harq
->
round
>=
RC
.
nrmac
[
mod_id
]
->
ul_bler
.
harq_round_max
-
1
){
}
else
if
(
harq
->
round
>=
RC
.
nrmac
[
mod_id
]
->
harq_round_max
-
1
)
{
nofBlocks
++
;
abort_nr_ul_harq
(
UE
,
harq_pid
);
abort_nr_ul_harq
(
UE
,
harq_pid
);
LOG_D
(
NR_MAC
,
LOG_D
(
NR_MAC
,
"RNTI %04x: Ulharq id %d crc failed in all rounds
\n
"
,
"RNTI %04x: Ulharq id %d crc failed in all rounds
\n
"
,
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
938f259b
...
@@ -449,8 +449,6 @@ void handle_nr_srs_measurements(const module_id_t module_id,
...
@@ -449,8 +449,6 @@ void handle_nr_srs_measurements(const module_id_t module_id,
const
uint8_t
num_reported_symbols
,
const
uint8_t
num_reported_symbols
,
nfapi_nr_srs_indication_reported_symbol_t
*
reported_symbol_list
);
nfapi_nr_srs_indication_reported_symbol_t
*
reported_symbol_list
);
float
returnULBLER
(
void
);
int16_t
ssb_index_from_prach
(
module_id_t
module_idP
,
int16_t
ssb_index_from_prach
(
module_id_t
module_idP
,
frame_t
frameP
,
frame_t
frameP
,
sub_frame_t
slotP
,
sub_frame_t
slotP
,
...
...
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