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
Michael Black
OpenXG-RAN
Commits
28a50c15
Commit
28a50c15
authored
Mar 14, 2017
by
gabrielC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some print and correct rnti for the pdcch_vars odd/even subframe
parent
bd489822
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
43 deletions
+46
-43
openair1/PHY/LTE_TRANSPORT/dci.c
openair1/PHY/LTE_TRANSPORT/dci.c
+1
-1
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+4
-4
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
+1
-1
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+40
-37
No files found.
openair1/PHY/LTE_TRANSPORT/dci.c
View file @
28a50c15
...
@@ -2890,7 +2890,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
...
@@ -2890,7 +2890,7 @@ void dci_decoding_procedure0(LTE_UE_PDCCH **pdcch_vars,
}
}
}
}
LOG_
I
(
PHY
,
"DCI decoding CRNTI [format: %d, nCCE[subframe: %d]: %d ], AggregationLevel %d
\n
"
,
format_c
,
subframe
,
pdcch_vars
[
eNB_id
]
->
nCCE
[
subframe
],
L2
);
LOG_
D
(
PHY
,
"DCI decoding CRNTI [format: %d, nCCE[subframe: %d]: %d ], AggregationLevel %d
\n
"
,
format_c
,
subframe
,
pdcch_vars
[
eNB_id
]
->
nCCE
[
subframe
],
L2
);
// memcpy(&dci_alloc[*dci_cnt].dci_pdu[0],dci_decoded_output,sizeof_bytes);
// memcpy(&dci_alloc[*dci_cnt].dci_pdu[0],dci_decoded_output,sizeof_bytes);
...
...
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
28a50c15
...
@@ -1368,7 +1368,7 @@ void rx_phich(PHY_VARS_UE *ue,
...
@@ -1368,7 +1368,7 @@ void rx_phich(PHY_VARS_UE *ue,
if
(
HI16
>
0
)
{
//NACK
if
(
HI16
>
0
)
{
//NACK
if
(
ue
->
ulsch_Msg3_active
[
eNB_id
]
==
1
)
{
if
(
ue
->
ulsch_Msg3_active
[
eNB_id
]
==
1
)
{
LOG_
I
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d
\n
"
,
LOG_
D
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d
\n
"
,
ue
->
Mod_id
,
harq_pid
,
ue
->
Mod_id
,
harq_pid
,
proc
->
frame_rx
,
proc
->
frame_rx
,
subframe
,
subframe
,
...
@@ -1389,7 +1389,7 @@ void rx_phich(PHY_VARS_UE *ue,
...
@@ -1389,7 +1389,7 @@ void rx_phich(PHY_VARS_UE *ue,
}
}
}
else
{
}
else
{
//#ifdef DEBUG_PHICH
//#ifdef DEBUG_PHICH
LOG_
I
(
PHY
,
"[UE %d][PUSCH %d] Frame %d subframe %d PHICH, received NAK (%d) nseq %d, ngroup %d round %d (Mlimit %d)
\n
"
,
LOG_
D
(
PHY
,
"[UE %d][PUSCH %d] Frame %d subframe %d PHICH, received NAK (%d) nseq %d, ngroup %d round %d (Mlimit %d)
\n
"
,
ue
->
Mod_id
,
harq_pid
,
ue
->
Mod_id
,
harq_pid
,
proc
->
frame_rx
%
1024
,
proc
->
frame_rx
%
1024
,
subframe
,
subframe
,
...
@@ -1436,7 +1436,7 @@ void rx_phich(PHY_VARS_UE *ue,
...
@@ -1436,7 +1436,7 @@ void rx_phich(PHY_VARS_UE *ue,
}
else
{
//ACK
}
else
{
//ACK
if
(
ue
->
ulsch_Msg3_active
[
eNB_id
]
==
1
)
{
if
(
ue
->
ulsch_Msg3_active
[
eNB_id
]
==
1
)
{
LOG_
I
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received ACK (%d) nseq %d, ngroup %d
\n\n
"
,
LOG_
D
(
PHY
,
"[UE %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received ACK (%d) nseq %d, ngroup %d
\n\n
"
,
ue
->
Mod_id
,
harq_pid
,
ue
->
Mod_id
,
harq_pid
,
proc
->
frame_rx
,
proc
->
frame_rx
,
subframe
,
subframe
,
...
@@ -1444,7 +1444,7 @@ void rx_phich(PHY_VARS_UE *ue,
...
@@ -1444,7 +1444,7 @@ void rx_phich(PHY_VARS_UE *ue,
nseq_PHICH
,
ngroup_PHICH
);
nseq_PHICH
,
ngroup_PHICH
);
}
else
{
}
else
{
//#ifdef PHICH_DEBUG
//#ifdef PHICH_DEBUG
LOG_
I
(
PHY
,
"[UE %d][PUSCH %d] Frame %d subframe %d PHICH, received ACK (%d) nseq %d, ngroup %d
\n\n
"
,
LOG_
D
(
PHY
,
"[UE %d][PUSCH %d] Frame %d subframe %d PHICH, received ACK (%d) nseq %d, ngroup %d
\n\n
"
,
ue
->
Mod_id
,
harq_pid
,
ue
->
Mod_id
,
harq_pid
,
proc
->
frame_rx
%
1024
,
proc
->
frame_rx
%
1024
,
subframe
,
HI16
,
subframe
,
HI16
,
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_coding.c
View file @
28a50c15
...
@@ -265,7 +265,7 @@ uint32_t ulsch_encoding(uint8_t *a,
...
@@ -265,7 +265,7 @@ uint32_t ulsch_encoding(uint8_t *a,
rnti
=
ue
->
pdcch_vars
[
subframe_rx
&
0x1
][
eNB_id
]
->
crnti
;
rnti
=
ue
->
pdcch_vars
[
subframe_rx
&
0x1
][
eNB_id
]
->
crnti
;
fill_CQI
(
ulsch
,
meas
,
0
,
harq_pid
,
ue
->
frame_parms
.
N_RB_DL
,
rnti
,
tmode
,
ue
->
sinr_eff
);
fill_CQI
(
ulsch
,
meas
,
0
,
harq_pid
,
ue
->
frame_parms
.
N_RB_DL
,
rnti
,
tmode
,
ue
->
sinr_eff
);
LOG_
I
(
PHY
,
"ULSCH Encoding rnti %x
\n
"
,
rnti
);
LOG_
D
(
PHY
,
"ULSCH Encoding rnti %x
\n
"
,
rnti
);
print_CQI
(
ulsch
->
o
,
ulsch
->
uci_format
,
0
,
ue
->
frame_parms
.
N_RB_DL
);
print_CQI
(
ulsch
->
o
,
ulsch
->
uci_format
,
0
,
ue
->
frame_parms
.
N_RB_DL
);
// save PUSCH pmi for later (transmission modes 4,5,6)
// save PUSCH pmi for later (transmission modes 4,5,6)
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
28a50c15
This diff is collapsed.
Click to expand it.
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