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
canghaiwuhen
OpenXG-RAN
Commits
9a1cfb65
Commit
9a1cfb65
authored
Mar 05, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Trigger ULSCH CQI ind only when instructed
parent
31d26733
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
4 deletions
+16
-4
openair2/LAYER2/MAC/mac.h
openair2/LAYER2/MAC/mac.h
+3
-0
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+13
-4
No files found.
openair2/LAYER2/MAC/mac.h
View file @
9a1cfb65
...
...
@@ -1719,6 +1719,9 @@ typedef struct {
uint8_t
SI_Decoded
;
int
ra_frame
;
// This variable keeps the frame in which the RA started for the specific UE. It is used in order
// to make sure that different UEs RA starts within a number of frames difference.
/// Phy_stub mode: variable tracks cqi_req since this is normally handled in
/// the PHY using LTE_UE_ULSCH_t to which we don't have access
int
cqi_req
;
eth_params_t
eth_params_n
;
...
...
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
9a1cfb65
...
...
@@ -494,7 +494,8 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
fill_rx_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
ulsch_buffer
,
buflen
,
rnti
,
index
);
}
}
//fill_ulsch_cqi_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, rnti);
if
(
UE_mac_inst
[
Mod_id
].
cqi_req
)
fill_ulsch_cqi_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
rnti
);
}
else
if
(
ul_config_pdu
->
pdu_type
==
NFAPI_UL_CONFIG_ULSCH_CQI_HARQ_RI_PDU_TYPE
)
{
...
...
@@ -524,7 +525,8 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
if
(
ulsch_harq_information
!=
NULL
)
fill_ulsch_harq_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
ulsch_harq_information
,
rnti
);
//fill_ulsch_cqi_indication_UE_MAC(Mod_id, frame, subframe, UL_INFO, rnti);
if
(
UE_mac_inst
[
Mod_id
].
cqi_req
)
fill_ulsch_cqi_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
rnti
);
}
else
if
(
ul_config_pdu
->
pdu_type
==
NFAPI_UL_CONFIG_UCI_HARQ_PDU_TYPE
)
{
...
...
@@ -812,8 +814,15 @@ int hi_dci0_req_UE_MAC(nfapi_hi_dci0_request_t* req, module_id_t Mod_id)
if
(
req
->
hi_dci0_request_body
.
hi_dci0_pdu_list
[
i
].
pdu_type
==
NFAPI_HI_DCI0_DCI_PDU_TYPE
)
{
LOG_D
(
PHY
,
"[UE-PHY_STUB] HI_DCI0_REQ sfn_sf:%d PDU[%d] - NFAPI_HI_DCI0_DCI_PDU_TYPE not used
\n
"
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
i
);
LOG_D
(
PHY
,
"[UE-PHY_STUB] HI_DCI0_REQ sfn_sf:%d PDU[%d] - "
"NFAPI_HI_DCI0_DCI_PDU_TYPE
\n
"
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
i
);
const
nfapi_hi_dci0_dci_pdu_rel8_t
*
dci
=
&
req
->
hi_dci0_request_body
.
hi_dci0_pdu_list
[
i
].
dci_pdu
.
dci_pdu_rel8
;
if
(
dci
->
rnti
!=
UE_mac_inst
[
Mod_id
].
crnti
)
continue
;
UE_mac_inst
[
Mod_id
].
cqi_req
=
dci
->
cqi_csi_request
;
}
else
if
(
req
->
hi_dci0_request_body
.
hi_dci0_pdu_list
[
i
].
pdu_type
==
NFAPI_HI_DCI0_HI_PDU_TYPE
)
{
...
...
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