Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
Michael Black
OpenXG UE
Commits
041ccea4
Commit
041ccea4
authored
Aug 13, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix unnecessary error message in handle_nr_ul_harq during RA
parent
361b38f8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+9
-1
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-1
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+1
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
View file @
041ccea4
...
@@ -511,13 +511,21 @@ void abort_nr_ul_harq(module_id_t mod_id, int UE_id, int8_t harq_pid)
...
@@ -511,13 +511,21 @@ void abort_nr_ul_harq(module_id_t mod_id, int UE_id, int8_t harq_pid)
sched_ctrl
->
sched_ul_bytes
=
0
;
sched_ctrl
->
sched_ul_bytes
=
0
;
}
}
void
handle_nr_ul_harq
(
module_id_t
mod_id
,
void
handle_nr_ul_harq
(
const
int
CC_idP
,
module_id_t
mod_id
,
frame_t
frame
,
frame_t
frame
,
sub_frame_t
slot
,
sub_frame_t
slot
,
const
nfapi_nr_crc_t
*
crc_pdu
)
const
nfapi_nr_crc_t
*
crc_pdu
)
{
{
gNB_MAC_INST
*
gNB_mac
=
RC
.
nrmac
[
mod_id
];
int
UE_id
=
find_nr_UE_id
(
mod_id
,
crc_pdu
->
rnti
);
int
UE_id
=
find_nr_UE_id
(
mod_id
,
crc_pdu
->
rnti
);
if
(
UE_id
<
0
)
{
if
(
UE_id
<
0
)
{
for
(
int
i
=
0
;
i
<
NR_NB_RA_PROC_MAX
;
++
i
)
{
NR_RA_t
*
ra
=
&
gNB_mac
->
common_channels
[
CC_idP
].
ra
[
i
];
if
(
ra
->
state
>=
WAIT_Msg3
&&
ra
->
rnti
==
crc_pdu
->
rnti
)
return
;
}
LOG_E
(
NR_MAC
,
"%s(): unknown RNTI %04x in PUSCH
\n
"
,
__func__
,
crc_pdu
->
rnti
);
LOG_E
(
NR_MAC
,
"%s(): unknown RNTI %04x in PUSCH
\n
"
,
__func__
,
crc_pdu
->
rnti
);
return
;
return
;
}
}
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
041ccea4
...
@@ -411,7 +411,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
...
@@ -411,7 +411,8 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
const
uint8_t
ul_cqi
,
const
uint8_t
ul_cqi
,
const
uint16_t
rssi
);
const
uint16_t
rssi
);
void
handle_nr_ul_harq
(
module_id_t
mod_id
,
void
handle_nr_ul_harq
(
const
int
CC_idP
,
module_id_t
mod_id
,
frame_t
frame
,
frame_t
frame
,
sub_frame_t
slot
,
sub_frame_t
slot
,
const
nfapi_nr_crc_t
*
crc_pdu
);
const
nfapi_nr_crc_t
*
crc_pdu
);
...
...
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
View file @
041ccea4
...
@@ -144,7 +144,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
...
@@ -144,7 +144,7 @@ void handle_nr_ulsch(NR_UL_IND_t *UL_info)
rx
->
timing_advance
,
rx
->
timing_advance
,
rx
->
ul_cqi
,
rx
->
ul_cqi
,
rx
->
rssi
);
rx
->
rssi
);
handle_nr_ul_harq
(
UL_info
->
module_id
,
UL_info
->
frame
,
UL_info
->
slot
,
crc
);
handle_nr_ul_harq
(
UL_info
->
CC_id
,
UL_info
->
module_id
,
UL_info
->
frame
,
UL_info
->
slot
,
crc
);
break
;
break
;
}
// for (j=0;j<UL_info->crc_ind.number_crcs;j++)
}
// for (j=0;j<UL_info->crc_ind.number_crcs;j++)
}
// for (i=0;i<UL_info->rx_ind.number_of_pdus;i++)
}
// for (i=0;i<UL_info->rx_ind.number_of_pdus;i++)
...
...
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