Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
openairinterface5G
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
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
JenRungHuang
openairinterface5G
Commits
83394cd3
Commit
83394cd3
authored
Nov 17, 2017
by
Panos Matzakos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Small correction wrt the UE_MAC state machine in phy_stub_UE
parent
725ad9d9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
4 deletions
+12
-4
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/PHY_INTERFACE/phy_stub_UE.c
+6
-4
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+6
-0
No files found.
openair2/PHY_INTERFACE/phy_stub_UE.c
View file @
83394cd3
...
...
@@ -493,7 +493,9 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
fill_crc_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
0
);
fill_rx_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
UE_mac_inst
[
Mod_id
].
RA_prach_resources
.
Msg3
,
buflen
,
rnti
);
Msg3_transmitted
(
Mod_id
,
0
,
frame
,
0
);
UE_mac_inst
[
Mod_id
].
first_ULSCH_Tx
=
0
;
// Panos: This should be done after the reception of the respective hi_dci0
//UE_mac_inst[Mod_id].first_ULSCH_Tx = 0;
}
else
{
ue_get_sdu
(
Mod_id
,
0
,
frame
,
subframe
,
0
,
ulsch_buffer
,
buflen
,
&
access_mode
);
...
...
@@ -516,7 +518,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
fill_crc_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
0
);
fill_rx_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
UE_mac_inst
[
Mod_id
].
RA_prach_resources
.
Msg3
,
buflen
,
rnti
);
Msg3_transmitted
(
Mod_id
,
0
,
frame
,
0
);
UE_mac_inst
[
Mod_id
].
first_ULSCH_Tx
=
0
;
//
UE_mac_inst[Mod_id].first_ULSCH_Tx = 0;
}
else
{
ue_get_sdu
(
Mod_id
,
0
,
frame
,
subframe
,
0
,
ulsch_buffer
,
buflen
,
&
access_mode
);
...
...
@@ -544,7 +546,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
fill_crc_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
0
);
fill_rx_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
UE_mac_inst
[
Mod_id
].
RA_prach_resources
.
Msg3
,
buflen
,
rnti
);
Msg3_transmitted
(
Mod_id
,
0
,
frame
,
0
);
UE_mac_inst
[
Mod_id
].
first_ULSCH_Tx
=
0
;
//
UE_mac_inst[Mod_id].first_ULSCH_Tx = 0;
}
else
{
ue_get_sdu
(
Mod_id
,
0
,
frame
,
subframe
,
0
,
ulsch_buffer
,
buflen
,
&
access_mode
);
...
...
@@ -571,7 +573,7 @@ void handle_nfapi_ul_pdu_UE_MAC(module_id_t Mod_id,
fill_crc_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
0
);
fill_rx_indication_UE_MAC
(
Mod_id
,
frame
,
subframe
,
UL_INFO
,
UE_mac_inst
[
Mod_id
].
RA_prach_resources
.
Msg3
,
buflen
,
rnti
);
Msg3_transmitted
(
Mod_id
,
0
,
frame
,
0
);
UE_mac_inst
[
Mod_id
].
first_ULSCH_Tx
=
0
;
//
UE_mac_inst[Mod_id].first_ULSCH_Tx = 0;
}
else
{
ue_get_sdu
(
Mod_id
,
0
,
frame
,
subframe
,
0
,
ulsch_buffer
,
buflen
,
&
access_mode
);
...
...
targets/RT/USER/lte-ue.c
View file @
83394cd3
...
...
@@ -648,6 +648,8 @@ static void *UE_thread_rxn_txnp4(void *arg) {
// Hardcode Mod_id for now. Will be changed later.
if
(
nfapi_mode
==
3
){
// Panos: is this the right place to call oai_subframe_indication to invoke p7 nfapi callbacks here?
//oai_subframe_insdication()
if
(
UE_mac_inst
[
Mod_id
].
tx_req
)
tx_req_UE_MAC
(
UE_mac_inst
[
Mod_id
].
tx_req
);
if
(
UE_mac_inst
[
Mod_id
].
dl_config_req
)
...
...
@@ -778,6 +780,10 @@ void *UE_thread(void *arg) {
#endif
int
sub_frame
=-
1
;
if
(
nfapi_mode
==
3
)
{
phy_stub_ticking
->
ticking_var
=
-
1
;
}
//int cumulated_shift=0;
...
...
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