From 36114b8420014a3f8afc9646f0db289783d52775 Mon Sep 17 00:00:00 2001
From: Raymond Knopp <raymond.knopp@eurecom.fr>
Date: Thu, 18 Sep 2014 10:24:57 +0000
Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5795
818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair2/RRC/LITE/MESSAGES/asn1_msg.c | 9 ++++++++-
openair2/UTIL/LOG/vcd_signal_dumper.c | 10 ++++++++--
openair2/UTIL/LOG/vcd_signal_dumper.h | 10 ++++++++--
3 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/openair2/RRC/LITE/MESSAGES/asn1_msg.c b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
index 88a86af6a8..3523687bbf 100644
--- a/openair2/RRC/LITE/MESSAGES/asn1_msg.c
+++ b/openair2/RRC/LITE/MESSAGES/asn1_msg.c
@@ -1305,7 +1305,14 @@ uint8_t do_RRCConnectionSetup(uint8_t Mod_id,
// PUCCH
physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.present=PUCCH_ConfigDedicated__ackNackRepetition_PR_release;
physicalConfigDedicated2->pucch_ConfigDedicated->ackNackRepetition.choice.release=0;
- physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode=NULL;//PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing;
+ if (frame_parms->frame_type == FDD) {
+
+ physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode=NULL;//PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing;
+ }
+ else {//TDD
+ physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode= CALLOC(1,sizeof(long));
+ *(physicalConfigDedicated2->pucch_ConfigDedicated->tdd_AckNackFeedbackMode) = PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_bundling;//PUCCH_ConfigDedicated__tdd_AckNackFeedbackMode_multiplexing;
+ }
// Pusch_config_dedicated
physicalConfigDedicated2->pusch_ConfigDedicated->betaOffset_ACK_Index = 0; // 2.00
diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.c b/openair2/UTIL/LOG/vcd_signal_dumper.c
index 9ecdd2215a..e6b5367b9c 100644
--- a/openair2/UTIL/LOG/vcd_signal_dumper.c
+++ b/openair2/UTIL/LOG/vcd_signal_dumper.c
@@ -75,14 +75,16 @@ struct vcd_module_s {
} vcd_module_s;
const char* eurecomVariablesNames[] = {
- "frame_number_eNB",
- "slot_number_eNB",
+ "frame_number_TX_eNB",
+ "frame_number_RX_eNB",
"frame_number_UE",
"slot_number_UE",
"daq_mbox",
"diff2",
"hw_subframe",
"hw_frame",
+ "txcnt",
+ "rxcnt",
"itti_send_msg",
"itti_poll_msg",
"itti_recv_msg",
@@ -118,6 +120,10 @@ const char* eurecomFunctionsNames[] = {
"eNB_thread_rx9",
/* PHY signals */
+ "ue_slot_fep",
+ "ue_rrc_measurements",
+ "ue_gain_control",
+ "ue_adjust_synch",
"lte_ue_measurement_procedures",
"lte_ue_pdcch_procedures",
"lte_ue_pbch_procedures",
diff --git a/openair2/UTIL/LOG/vcd_signal_dumper.h b/openair2/UTIL/LOG/vcd_signal_dumper.h
index f3e26c2b18..a01966b29f 100644
--- a/openair2/UTIL/LOG/vcd_signal_dumper.h
+++ b/openair2/UTIL/LOG/vcd_signal_dumper.h
@@ -48,14 +48,16 @@
/* WARNING: if you edit the enums below, update also string definitions in vcd_signal_dumper.c */
typedef enum
{
- VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_ENB = 0,
- VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_ENB,
+ VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX_ENB = 0,
+ VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_RX_ENB,
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_UE,
VCD_SIGNAL_DUMPER_VARIABLES_SLOT_NUMBER_UE,
VCD_SIGNAL_DUMPER_VARIABLES_DAQ_MBOX,
VCD_SIGNAL_DUMPER_VARIABLES_DIFF,
VCD_SIGNAL_DUMPER_VARIABLES_HW_SUBFRAME,
VCD_SIGNAL_DUMPER_VARIABLES_HW_FRAME,
+ VCD_SIGNAL_DUMPER_VARIABLES_TXCNT,
+ VCD_SIGNAL_DUMPER_VARIABLES_RXCNT,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_SEND_MSG,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_POLL_MSG,
VCD_SIGNAL_DUMPER_VARIABLE_ITTI_RECV_MSG,
@@ -93,6 +95,10 @@ typedef enum {
VCD_SIGNAL_DUMPER_FUNCTIONS_eNB_PROC_RX9,
/* PHY signals */
+ VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP,
+ VCD_SIGNAL_DUMPER_FUNCTIONS_UE_RRC_MEASUREMENTS,
+ VCD_SIGNAL_DUMPER_FUNCTIONS_UE_GAIN_CONTROL,
+ VCD_SIGNAL_DUMPER_FUNCTIONS_UE_ADJUST_SYNCH,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_MEASUREMENT_PROCEDURES,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PDCCH_PROCEDURES,
VCD_SIGNAL_DUMPER_FUNCTIONS_UE_PBCH_PROCEDURES,
--
GitLab