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
f68a54eb
Commit
f68a54eb
authored
Jul 28, 2016
by
Cedric Roux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes for the T
parent
dcfb54c4
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
14 deletions
+22
-14
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
+1
-1
openair1/PHY/LTE_TRANSPORT/phich.c
openair1/PHY/LTE_TRANSPORT/phich.c
+1
-1
openair1/PHY/LTE_TRANSPORT/pucch.c
openair1/PHY/LTE_TRANSPORT/pucch.c
+2
-2
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
+2
-2
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+11
-6
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+2
-0
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-softmodem.c
+3
-2
No files found.
openair1/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
View file @
f68a54eb
...
@@ -335,7 +335,7 @@ int32_t lte_ul_channel_estimation(PHY_VARS_eNB *eNB,
...
@@ -335,7 +335,7 @@ int32_t lte_ul_channel_estimation(PHY_VARS_eNB *eNB,
#if T_TRACER
#if T_TRACER
if
(
aa
==
0
)
if
(
aa
==
0
)
T
(
T_ENB_PHY_UL_CHANNEL_ESTIMATE
,
T_INT
(
eNB_id
),
T_INT
(
UE_id
),
T
(
T_ENB_PHY_UL_CHANNEL_ESTIMATE
,
T_INT
(
eNB_id
),
T_INT
(
UE_id
),
T_INT
(
p
hy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
),
T_INT
(
subframe
),
T_INT
(
p
roc
->
frame_rx
),
T_INT
(
subframe
),
T_INT
(
0
),
T_BUFFER
(
ul_ch_estimates_time
[
0
],
512
*
4
));
T_INT
(
0
),
T_BUFFER
(
ul_ch_estimates_time
[
0
],
512
*
4
));
#endif
#endif
...
...
openair1/PHY/LTE_TRANSPORT/phich.c
View file @
f68a54eb
...
@@ -1511,7 +1511,7 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
...
@@ -1511,7 +1511,7 @@ void generate_phich_top(PHY_VARS_eNB *eNB,
if
((
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
dci_alloc
==
0
)
&&
if
((
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
dci_alloc
==
0
)
&&
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
rar_alloc
==
0
)
)
{
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
rar_alloc
==
0
)
)
{
if
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
phich_ACK
==
0
)
{
if
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
phich_ACK
==
0
)
{
T
(
T_ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
eNB
->
proc
->
frame_tx
),
T
(
T_ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
proc
->
frame_tx
),
T_INT
(
subframe
),
T_INT
(
UE_id
),
T_INT
(
ulsch
[
UE_id
]
->
rnti
),
T_INT
(
harq_pid
));
T_INT
(
subframe
),
T_INT
(
UE_id
),
T_INT
(
ulsch
[
UE_id
]
->
rnti
),
T_INT
(
harq_pid
));
LOG_D
(
PHY
,
"[eNB %d][PUSCH %d] frame %d, subframe %d : PHICH NACK / (no format0 DCI) Setting subframe_scheduling_flag
\n
"
,
LOG_D
(
PHY
,
"[eNB %d][PUSCH %d] frame %d, subframe %d : PHICH NACK / (no format0 DCI) Setting subframe_scheduling_flag
\n
"
,
eNB
->
Mod_id
,
harq_pid
,
proc
->
frame_tx
,
subframe
);
eNB
->
Mod_id
,
harq_pid
,
proc
->
frame_tx
,
subframe
);
...
...
openair1/PHY/LTE_TRANSPORT/pucch.c
View file @
f68a54eb
...
@@ -802,7 +802,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -802,7 +802,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
eNB
->
pucch1_stats_thres
[
UE_id
][(
subframe
<<
10
)
+
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]]
=
sigma2_dB
+
pucch1_thres
;
eNB
->
pucch1_stats_thres
[
UE_id
][(
subframe
<<
10
)
+
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]]
=
sigma2_dB
+
pucch1_thres
;
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]
=
(
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]
+
1
)
&
1023
;
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]
=
(
eNB
->
pucch1_stats_cnt
[
UE_id
][
subframe
]
+
1
)
&
1023
;
T
(
T_ENB_PHY_PUCCH_1_ENERGY
,
T_INT
(
phy_vars_
eNB
->
Mod_id
),
T_INT
(
UE_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T
(
T_ENB_PHY_PUCCH_1_ENERGY
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
UE_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
stat_max
),
T_INT
(
sigma2_dB
+
pucch1_thres
));
T_INT
(
stat_max
),
T_INT
(
sigma2_dB
+
pucch1_thres
));
/*
/*
...
@@ -1047,7 +1047,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
...
@@ -1047,7 +1047,7 @@ uint32_t rx_pucch(PHY_VARS_eNB *eNB,
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]
=
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]
+
1
)
&
1023
;
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]
=
(
eNB
->
pucch1ab_stats_cnt
[
UE_id
][
subframe
]
+
1
)
&
1023
;
/* frame not available here - set to -1 for the moment */
/* frame not available here - set to -1 for the moment */
T
(
T_ENB_PHY_PUCCH_1AB_IQ
,
T_INT
(
phy_vars_
eNB
->
Mod_id
),
T_INT
(
UE_id
),
T_INT
(
-
1
),
T_INT
(
subframe
),
T_INT
(
stat_re
),
T_INT
(
stat_im
));
T
(
T_ENB_PHY_PUCCH_1AB_IQ
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
UE_id
),
T_INT
(
-
1
),
T_INT
(
subframe
),
T_INT
(
stat_re
),
T_INT
(
stat_im
));
*
payload
=
(
stat_re
<
0
)
?
1
:
0
;
*
payload
=
(
stat_re
<
0
)
?
1
:
0
;
...
...
openair1/PHY/LTE_TRANSPORT/ulsch_demodulation.c
View file @
f68a54eb
...
@@ -1842,10 +1842,10 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
...
@@ -1842,10 +1842,10 @@ void rx_ulsch(PHY_VARS_eNB *eNB,
llrp
=
(
int16_t
*
)
&
pusch_vars
->
llr
[
0
];
llrp
=
(
int16_t
*
)
&
pusch_vars
->
llr
[
0
];
T
(
T_ENB_PHY_PUSCH_IQ
,
T_INT
(
eNB_id
),
T_INT
(
UE_id
),
T_INT
(
p
hy_vars_eNB
->
proc
[
sched_subframe
].
frame_rx
),
T
(
T_ENB_PHY_PUSCH_IQ
,
T_INT
(
eNB_id
),
T_INT
(
UE_id
),
T_INT
(
p
roc
->
frame_rx
),
T_INT
(
subframe
),
T_INT
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
nb_rb
),
T_INT
(
subframe
),
T_INT
(
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
nb_rb
),
T_INT
(
frame_parms
->
N_RB_UL
),
T_INT
(
frame_parms
->
symbols_per_tti
),
T_INT
(
frame_parms
->
N_RB_UL
),
T_INT
(
frame_parms
->
symbols_per_tti
),
T_BUFFER
(
eNB_
pusch_vars
->
rxdataF_comp
[
eNB_id
][
0
],
T_BUFFER
(
pusch_vars
->
rxdataF_comp
[
eNB_id
][
0
],
2
*
/* ulsch[UE_id]->harq_processes[harq_pid]->nb_rb */
frame_parms
->
N_RB_UL
*
12
*
frame_parms
->
symbols_per_tti
*
2
));
2
*
/* ulsch[UE_id]->harq_processes[harq_pid]->nb_rb */
frame_parms
->
N_RB_UL
*
12
*
frame_parms
->
symbols_per_tti
*
2
));
for
(
l
=
0
;
l
<
frame_parms
->
symbols_per_tti
-
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
srs_active
;
l
++
)
{
for
(
l
=
0
;
l
<
frame_parms
->
symbols_per_tti
-
ulsch
[
UE_id
]
->
harq_processes
[
harq_pid
]
->
srs_active
;
l
++
)
{
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
f68a54eb
...
@@ -767,6 +767,10 @@ void generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
...
@@ -767,6 +767,10 @@ void generate_eNB_dlsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
eNB
->
Mod_id
,
dci_alloc
->
rnti
,
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
current_harq_pid
,
frame
,
subframe
);
eNB
->
Mod_id
,
dci_alloc
->
rnti
,
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
current_harq_pid
,
frame
,
subframe
);
T
(
T_ENB_PHY_DLSCH_UE_DCI
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
UE_id
),
T_INT
(
dci_alloc
->
rnti
),
T_INT
(
dci_alloc
->
format
),
T_INT
(
eNB
->
dlsch
[(
int
)
UE_id
][
0
]
->
current_harq_pid
));
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
nCCE
[
subframe
]
=
dci_alloc
->
firstCCE
;
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
nCCE
[
subframe
]
=
dci_alloc
->
firstCCE
;
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"] Frame %d subframe %d : CCE resource for ue DCI (PDSCH %"
PRIx16
") => %"
PRIu8
"/%u
\n
"
,
eNB
->
Mod_id
,
frame
,
subframe
,
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"] Frame %d subframe %d : CCE resource for ue DCI (PDSCH %"
PRIx16
") => %"
PRIu8
"/%u
\n
"
,
eNB
->
Mod_id
,
frame
,
subframe
,
...
@@ -858,6 +862,9 @@ void generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
...
@@ -858,6 +862,9 @@ void generate_eNB_ulsch_params(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,DCI_ALLOC
else
else
eNB
->
ulsch
[(
uint32_t
)
UE_id
]
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
eNB
->
ulsch
[(
uint32_t
)
UE_id
]
->
harq_processes
[
harq_pid
]
->
subframe_scheduling_flag
=
1
;
T
(
T_ENB_PHY_ULSCH_UE_DCI
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
UE_id
),
T_INT
(
dci_alloc
->
rnti
),
T_INT
(
harq_pid
));
}
}
void
pdsch_procedures
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
LTE_eNB_DLSCH_t
*
dlsch
,
LTE_eNB_DLSCH_t
*
dlsch1
,
LTE_eNB_UE_stats
*
ue_stats
,
int
ra_flag
,
int
num_pdcch_symbols
,
int
abstraction_flag
)
{
void
pdsch_procedures
(
PHY_VARS_eNB
*
eNB
,
eNB_rxtx_proc_t
*
proc
,
LTE_eNB_DLSCH_t
*
dlsch
,
LTE_eNB_DLSCH_t
*
dlsch1
,
LTE_eNB_UE_stats
*
ue_stats
,
int
ra_flag
,
int
num_pdcch_symbols
,
int
abstraction_flag
)
{
...
@@ -997,11 +1004,7 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,LTE_eNB_DLSCH_t *d
...
@@ -997,11 +1004,7 @@ void pdsch_procedures(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,LTE_eNB_DLSCH_t *d
#ifdef DEBUG_DLSCH
#ifdef DEBUG_DLSCH
LOG_T
(
PHY
,
"eNB DLSCH SDU:
\n
"
);
LOG_T
(
PHY
,
"eNB DLSCH SDU:
\n
"
);
T
(
T_ENB_PHY_DLSCH_UE_DCI
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
UE_id
),
//eNB->dlsch[(uint8_t)UE_id][0]->nCCE[subframe] = DCI_pdu->dci_alloc[i].firstCCE;
T_INT
(
DCI_pdu
->
dci_alloc
[
i
].
rnti
),
T_INT
(
DCI_pdu
->
dci_alloc
[
i
].
format
),
T_INT
(
eNB
->
dlsch
[(
int
)
UE_id
][
0
]
->
current_harq_pid
));
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
nCCE
[
subframe
]
=
DCI_pdu
->
dci_alloc
[
i
].
firstCCE
;
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"] Frame %d subframe %d : CCE resource for ue DCI (PDSCH %"
PRIx16
") => %"
PRIu8
"/%u
\n
"
,
eNB
->
Mod_id
,
eNB
->
proc
[
sched_subframe
].
frame_tx
,
subframe
,
LOG_D
(
PHY
,
"[eNB %"
PRIu8
"] Frame %d subframe %d : CCE resource for ue DCI (PDSCH %"
PRIx16
") => %"
PRIu8
"/%u
\n
"
,
eNB
->
Mod_id
,
eNB
->
proc
[
sched_subframe
].
frame_tx
,
subframe
,
DCI_pdu
->
dci_alloc
[
i
].
rnti
,
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
nCCE
[
subframe
],
DCI_pdu
->
dci_alloc
[
i
].
firstCCE
);
DCI_pdu
->
dci_alloc
[
i
].
rnti
,
eNB
->
dlsch
[(
uint8_t
)
UE_id
][
0
]
->
nCCE
[
subframe
],
DCI_pdu
->
dci_alloc
[
i
].
firstCCE
);
...
@@ -1108,6 +1111,8 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
...
@@ -1108,6 +1111,8 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
+
(
subframe
&
1
),
1
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_TX
+
(
subframe
&
1
),
1
);
start_meas
(
&
eNB
->
phy_proc_tx
);
start_meas
(
&
eNB
->
phy_proc_tx
);
T
(
T_ENB_PHY_DL_TICK
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
));
for
(
i
=
0
;
i
<
NUMBER_OF_UE_MAX
;
i
++
)
{
for
(
i
=
0
;
i
<
NUMBER_OF_UE_MAX
;
i
++
)
{
// If we've dropped the UE, go back to PRACH mode for this UE
// If we've dropped the UE, go back to PRACH mode for this UE
if
((
frame
==
0
)
&&
(
subframe
==
0
))
{
if
((
frame
==
0
)
&&
(
subframe
==
0
))
{
...
@@ -2632,7 +2637,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
...
@@ -2632,7 +2637,7 @@ void phy_procedures_eNB_uespec_RX(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc,const
T
(
T_ENB_PHY_UL_TICK
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
));
T
(
T_ENB_PHY_UL_TICK
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
));
T
(
T_ENB_PHY_INPUT_SIGNAL
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
0
),
T
(
T_ENB_PHY_INPUT_SIGNAL
,
T_INT
(
eNB
->
Mod_id
),
T_INT
(
frame
),
T_INT
(
subframe
),
T_INT
(
0
),
T_BUFFER
(
&
eNB
->
lte_eNB_
common_vars
.
rxdata
[
0
][
0
][
subframe
*
eNB
->
frame_parms
.
samples_per_tti
],
T_BUFFER
(
&
eNB
->
common_vars
.
rxdata
[
0
][
0
][
subframe
*
eNB
->
frame_parms
.
samples_per_tti
],
eNB
->
frame_parms
.
samples_per_tti
*
4
));
eNB
->
frame_parms
.
samples_per_tti
*
4
));
eNB
->
rb_mask_ul
[
0
]
=
0
;
eNB
->
rb_mask_ul
[
0
]
=
0
;
...
...
targets/RT/USER/lte-enb.c
View file @
f68a54eb
...
@@ -1201,6 +1201,8 @@ static void* eNB_thread_FH( void* param ) {
...
@@ -1201,6 +1201,8 @@ static void* eNB_thread_FH( void* param ) {
AssertFatal
(
1
==
0
,
"Unknown eNB->node_function %d"
,
eNB
->
node_function
);
AssertFatal
(
1
==
0
,
"Unknown eNB->node_function %d"
,
eNB
->
node_function
);
}
}
T
(
T_ENB_MASTER_TICK
,
T_INT
(
0
),
T_INT
(
proc
->
frame_rx
),
T_INT
(
proc
->
subframe_rx
));
// At this point, all information for subframe has been received on FH interface
// At this point, all information for subframe has been received on FH interface
// If this proc is to provide synchronization, do so
// If this proc is to provide synchronization, do so
for
(
i
=
0
;
i
<
proc
->
num_slaves
;
i
++
)
{
for
(
i
=
0
;
i
<
proc
->
num_slaves
;
i
++
)
{
...
...
targets/RT/USER/lte-softmodem.c
View file @
f68a54eb
...
@@ -682,11 +682,11 @@ static void get_options (int argc, char **argv)
...
@@ -682,11 +682,11 @@ static void get_options (int argc, char **argv)
LONG_OPTION_DUMP_FRAME
,
LONG_OPTION_DUMP_FRAME
,
LONG_OPTION_LOOPMEMORY
,
LONG_OPTION_LOOPMEMORY
,
LONG_OPTION_PHYTEST
,
LONG_OPTION_PHYTEST
,
LONG_OPTION_MMAPPED_DMA
LONG_OPTION_MMAPPED_DMA
,
#if T_TRACER
#if T_TRACER
,
LONG_OPTION_T_PORT
,
LONG_OPTION_T_PORT
,
LONG_OPTION_T_NOWAIT
,
LONG_OPTION_T_NOWAIT
,
LONG_OPTION_T_DONT_FORK
,
#endif
#endif
};
};
...
@@ -710,6 +710,7 @@ static void get_options (int argc, char **argv)
...
@@ -710,6 +710,7 @@ static void get_options (int argc, char **argv)
#if T_TRACER
#if T_TRACER
{
"T_port"
,
required_argument
,
0
,
LONG_OPTION_T_PORT
},
{
"T_port"
,
required_argument
,
0
,
LONG_OPTION_T_PORT
},
{
"T_nowait"
,
no_argument
,
0
,
LONG_OPTION_T_NOWAIT
},
{
"T_nowait"
,
no_argument
,
0
,
LONG_OPTION_T_NOWAIT
},
{
"T_dont_fork"
,
no_argument
,
0
,
LONG_OPTION_T_DONT_FORK
},
#endif
#endif
{
NULL
,
0
,
NULL
,
0
}
{
NULL
,
0
,
NULL
,
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