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
76564030
Commit
76564030
authored
Dec 13, 2016
by
hbilel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ue-tdd_fix_issueOai1B_44' into develop_integration_w50
Conflicts: targets/RT/USER/lte-ue.c
parents
82abd8dc
a8605444
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
132 additions
and
26 deletions
+132
-26
openair1/PHY/LTE_TRANSPORT/rar_tools.c
openair1/PHY/LTE_TRANSPORT/rar_tools.c
+6
-0
openair1/SCHED/phy_procedures_lte_ue.c
openair1/SCHED/phy_procedures_lte_ue.c
+18
-3
openair2/UTIL/LOG/vcd_signal_dumper.c
openair2/UTIL/LOG/vcd_signal_dumper.c
+18
-0
openair2/UTIL/LOG/vcd_signal_dumper.h
openair2/UTIL/LOG/vcd_signal_dumper.h
+18
-0
openair3/NAS/COMMON/IES/EsmMessageContainer.c
openair3/NAS/COMMON/IES/EsmMessageContainer.c
+1
-1
openair3/NAS/COMMON/UTIL/TLVDecoder.h
openair3/NAS/COMMON/UTIL/TLVDecoder.h
+1
-1
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+70
-21
No files found.
openair1/PHY/LTE_TRANSPORT/rar_tools.c
View file @
76564030
...
...
@@ -34,6 +34,7 @@
#include "SCHED/extern.h"
#include "LAYER2/MAC/defs.h"
#include "SCHED/defs.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
#include "assertions.h"
...
...
@@ -171,6 +172,8 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *ue,
unsigned
char
eNB_id
)
{
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR
,
VCD_FUNCTION_IN
);
// RA_HEADER_RAPID *rarh = (RA_HEADER_RAPID *)rar_pdu;
uint8_t
transmission_mode
=
ue
->
transmission_mode
[
eNB_id
];
unsigned
char
*
rar_pdu
=
ue
->
dlsch_ra
[
eNB_id
]
->
harq_processes
[
0
]
->
b
;
...
...
@@ -315,6 +318,9 @@ int generate_ue_ulsch_params_from_rar(PHY_VARS_UE *ue,
msg
(
"ulsch ra (UE): TPC %d
\n
"
,
ulsch
->
harq_processes
[
harq_pid
]
->
TPC
);
msg
(
"ulsch ra (UE): O %d
\n
"
,
ulsch
->
O
);
msg
(
"ulsch ra (UE): ORI %d
\n
"
,
ulsch
->
O_RI
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR
,
VCD_FUNCTION_OUT
);
//#endif
return
(
0
);
}
...
...
openair1/SCHED/phy_procedures_lte_ue.c
View file @
76564030
...
...
@@ -942,6 +942,8 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc) {
int
dummy_tx_buffer
[
3840
*
4
]
__attribute__
((
aligned
(
16
)));
#endif
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON
,
VCD_FUNCTION_IN
);
start_meas
(
&
ue
->
ofdm_mod_stats
);
nsymb
=
(
frame_parms
->
Ncp
==
0
)
?
14
:
12
;
...
...
@@ -1043,7 +1045,7 @@ void ulsch_common_procedures(PHY_VARS_UE *ue, UE_rxtx_proc_t *proc) {
stop_meas
(
&
ue
->
ofdm_mod_stats
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON
,
VCD_FUNCTION_OUT
);
}
...
...
@@ -1054,6 +1056,8 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
int
prach_power
;
PRACH_RESOURCES_t
prach_resources_local
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH
,
VCD_FUNCTION_IN
);
ue
->
generate_prach
=
0
;
if
(
ue
->
mac_enabled
==
0
){
...
...
@@ -1171,6 +1175,8 @@ void ue_prach_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
if
(
ue
->
prach_cnt
==
3
)
ue
->
generate_prach
=
0
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH
,
VCD_FUNCTION_OUT
);
}
void
ue_ulsch_uespec_procedures
(
PHY_VARS_UE
*
ue
,
UE_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
abstraction_flag
)
{
...
...
@@ -1190,6 +1196,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
uint8_t
ulsch_input_buffer
[
5477
]
__attribute__
((
aligned
(
32
)));
uint8_t
access_mode
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
,
VCD_FUNCTION_IN
);
// get harq_pid from subframe relationship
harq_pid
=
subframe2harq_pid
(
&
ue
->
frame_parms
,
frame_tx
,
...
...
@@ -1218,8 +1226,8 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
}
else
{
if
(
harq_pid
==
255
)
{
LOG_E
(
PHY
,
"[UE%d] Frame %d ulsch_decoding.c: FATAL ERROR: illegal harq_pid, returning
\n
"
,
Mod_id
,
frame_tx
);
LOG_E
(
PHY
,
"[UE%d] Frame %d
subframe %d
ulsch_decoding.c: FATAL ERROR: illegal harq_pid, returning
\n
"
,
Mod_id
,
frame_tx
,
subframe_tx
);
mac_xface
->
macphy_exit
(
"Error in ulsch_decoding"
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX
,
VCD_FUNCTION_OUT
);
stop_meas
(
&
ue
->
phy_proc_tx
);
...
...
@@ -1456,6 +1464,9 @@ void ue_ulsch_uespec_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB
ue
->
sr
[
subframe_tx
]
=
0
;
}
}
// subframe_scheduling_flag==1
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
,
VCD_FUNCTION_OUT
);
}
void
ue_srs_procedures
(
PHY_VARS_UE
*
ue
,
UE_rxtx_proc_t
*
proc
,
uint8_t
eNB_id
,
uint8_t
abstraction_flag
)
...
...
@@ -1553,6 +1564,8 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
int
tx_amp
;
int8_t
Po_PUCCH
;
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH
,
VCD_FUNCTION_IN
);
SOUNDINGRS_UL_CONFIG_DEDICATED
*
pSoundingrs_ul_config_dedicated
=&
ue
->
soundingrs_ul_config_dedicated
[
eNB_id
];
// 36.213 8.2
...
...
@@ -1743,6 +1756,8 @@ void ue_pucch_procedures(PHY_VARS_UE *ue,UE_rxtx_proc_t *proc,uint8_t eNB_id,uin
}
}
// SR_Payload==1
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH
,
VCD_FUNCTION_OUT
);
// PUCCH 2x
if
(
ue
->
generate_ul_signal
[
eNB_id
]
==
0
)
{
// we have not generated ACK/NAK/SR in this subframe
...
...
openair2/UTIL/LOG/vcd_signal_dumper.c
View file @
76564030
...
...
@@ -174,6 +174,8 @@ const char* eurecomVariablesNames[] = {
"ue0_SFN5"
,
"ue0_SFN6"
,
"ue0_SFN7"
,
"ue0_trx_read_ns"
,
"ue0_trx_write_ns"
,
};
const
char
*
eurecomFunctionsNames
[]
=
{
...
...
@@ -188,6 +190,17 @@ const char* eurecomFunctionsNames[] = {
"ue_thread_synch"
,
"ue_thread_rxtx0"
,
"ue_thread_rxtx1"
,
"trx_read_sf9"
,
"trx_write_sf9"
,
"ue_signal_cond_rxtx"
,
"ue_wait_cond_rxtx0"
,
"ue_wait_cond_rxtx1"
,
"ue_lock_mutex_rxtx_for_cond_wait0"
,
"ue_lock_mutex_rxtx_for_cond_wait1"
,
"ue_lock_mutex_rxtx_for_cnt_decrement0"
,
"ue_lock_mutex_rxtx_for_cnt_decrement1"
,
"ue_lock_mutex_rxtx_for_cnt_increment0"
,
"ue_lock_mutex_rxtx_for_cnt_increment1"
,
/* RRH signals */
"eNB_tx"
,
...
...
@@ -218,6 +231,11 @@ const char* eurecomFunctionsNames[] = {
"phy_eNB_slot_fep"
,
"phy_procedures_ue_tx"
,
"phy_procedures_ue_rx"
,
"phy_procedures_ue_tx_ulsch_uespec"
,
"phy_procedures_ue_tx_pucch"
,
"phy_procedures_ue_tx_ulsch_common"
,
"phy_procedures_ue_tx_prach"
,
"phy_procedures_ue_tx_ulsch_rar"
,
"phy_procedures_eNB_lte"
,
"phy_procedures_UE_lte"
,
"pdsch_thread"
,
...
...
openair2/UTIL/LOG/vcd_signal_dumper.h
View file @
76564030
...
...
@@ -146,6 +146,8 @@ typedef enum {
VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN5
,
VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN6
,
VCD_SIGNAL_DUMPER_VARIABLES_UE0_SFN7
,
VCD_SIGNAL_DUMPER_VARIABLES_UE0_TRX_READ_NS
,
VCD_SIGNAL_DUMPER_VARIABLES_UE0_TRX_WRITE_NS
,
VCD_SIGNAL_DUMPER_VARIABLES_LAST
,
VCD_SIGNAL_DUMPER_VARIABLES_END
=
VCD_SIGNAL_DUMPER_VARIABLES_LAST
,
}
vcd_signal_dump_variables
;
...
...
@@ -162,6 +164,17 @@ typedef enum {
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_SYNCH
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX0
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_THREAD_RXTX1
,
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ_SF9
,
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE_SF9
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SIGNAL_COND_RXTX
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_WAIT_COND_RXTX0
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_WAIT_COND_RXTX1
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT0
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT1
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT0
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT1
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT0
,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT1
,
/* RRH signals */
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_TX
,
...
...
@@ -192,6 +205,11 @@ typedef enum {
VCD_SIGNAL_DUMPER_FUNCTIONS_ENB_SLOT_FEP
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_RX
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PUCCH
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_COMMON
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_PRACH
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_TX_ULSCH_RAR
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_ENB_LTE
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PHY_PROCEDURES_UE_LTE
,
VCD_SIGNAL_DUMPER_FUNCTIONS_PDSCH_THREAD
,
...
...
openair3/NAS/COMMON/IES/EsmMessageContainer.c
View file @
76564030
...
...
@@ -28,7 +28,7 @@
#include "EsmMessageContainer.h"
#include "nas_log.h"
#define NAS_DEBUG 1
//
#define NAS_DEBUG 1
int
decode_esm_message_container
(
EsmMessageContainer
*
esmmessagecontainer
,
uint8_t
iei
,
uint8_t
*
buffer
,
uint32_t
len
)
{
...
...
openair3/NAS/COMMON/UTIL/TLVDecoder.h
View file @
76564030
...
...
@@ -26,7 +26,7 @@
#include "nas_log.h"
#ifndef NAS_DEBUG
# define NAS_DEBUG 1
//
# define NAS_DEBUG 1
#endif
#define DECODE_U8(bUFFER, vALUE, sIZE) \
...
...
targets/RT/USER/lte-ue.c
View file @
76564030
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