Commit 233e97c5 authored by Florian Kaltenberger's avatar Florian Kaltenberger

some debbuing information

parent 8985d4c9
...@@ -52,7 +52,7 @@ void generate_grouphop(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -52,7 +52,7 @@ void generate_grouphop(LTE_DL_FRAME_PARMS *frame_parms)
x2 = frame_parms->Nid_cell/30; x2 = frame_parms->Nid_cell/30;
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("[PHY] GroupHop:"); printf("[PHY] GroupHop:");
#endif #endif
for (ns=0; ns<20; ns++) { for (ns=0; ns<20; ns++) {
...@@ -68,12 +68,12 @@ void generate_grouphop(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -68,12 +68,12 @@ void generate_grouphop(LTE_DL_FRAME_PARMS *frame_parms)
} }
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[ns]); printf("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.grouphop[ns]);
#endif #endif
} }
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("\n"); printf("\n");
#endif #endif
} }
...@@ -89,7 +89,7 @@ void generate_seqhop(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -89,7 +89,7 @@ void generate_seqhop(LTE_DL_FRAME_PARMS *frame_parms)
s = lte_gold_generic(&x1,&x2,reset); s = lte_gold_generic(&x1,&x2,reset);
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("[PHY] SeqHop:"); printf("[PHY] SeqHop:");
#endif #endif
for (ns=0; ns<20; ns++) { for (ns=0; ns<20; ns++) {
...@@ -100,12 +100,12 @@ void generate_seqhop(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -100,12 +100,12 @@ void generate_seqhop(LTE_DL_FRAME_PARMS *frame_parms)
frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[ns] = 0; frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[ns] = 0;
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[ns]); printf("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.seqhop[ns]);
#endif #endif
} }
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("\n"); printf("\n");
#endif #endif
} }
...@@ -124,7 +124,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -124,7 +124,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms)
x2 = (32*(uint32_t)(frame_parms->Nid_cell/30)) + fss_pusch; x2 = (32*(uint32_t)(frame_parms->Nid_cell/30)) + fss_pusch;
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("[PHY] nPRS:"); printf("[PHY] nPRS:");
#endif #endif
for (n=0; n<(20*Nsymb_UL); n++) { //loop over total number of bytes to generate for (n=0; n<(20*Nsymb_UL); n++) { //loop over total number of bytes to generate
...@@ -137,7 +137,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -137,7 +137,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms)
if (n == next) { if (n == next) {
frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[ns] = ((uint8_t*)&s)[next&3]; frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[ns] = ((uint8_t*)&s)[next&3];
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[ns]); printf("%d.",frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[ns]);
#endif #endif
ns++; ns++;
next+=Nsymb_UL; next+=Nsymb_UL;
...@@ -145,7 +145,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms) ...@@ -145,7 +145,7 @@ void generate_nPRS(LTE_DL_FRAME_PARMS *frame_parms)
} }
#ifdef DEBUG_GROUPHOP #ifdef DEBUG_GROUPHOP
msg("\n"); printf("\n");
#endif #endif
} }
......
...@@ -1016,7 +1016,7 @@ int32_t generate_prach( PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id, uint8_t subfra ...@@ -1016,7 +1016,7 @@ int32_t generate_prach( PHY_VARS_UE *phy_vars_ue, uint8_t eNB_id, uint8_t subfra
#if defined(EXMIMO) || defined(OAI_USRP) #if defined(EXMIMO) || defined(OAI_USRP)
int j; int j;
int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*phy_vars_ue->lte_frame_parms.samples_per_tti; int overflow = prach_start + prach_len - LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*phy_vars_ue->lte_frame_parms.samples_per_tti;
LOG_D( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow ); LOG_I( PHY, "prach_start=%d, overflow=%d\n", prach_start, overflow );
for (i=prach_start,j=0; i<min(phy_vars_ue->lte_frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) { for (i=prach_start,j=0; i<min(phy_vars_ue->lte_frame_parms.samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME,prach_start+prach_len); i++,j++) {
((int16_t*)phy_vars_ue->lte_ue_common_vars.txdata[0])[2*i] = prach[2*j]<<4; ((int16_t*)phy_vars_ue->lte_ue_common_vars.txdata[0])[2*i] = prach[2*j]<<4;
......
...@@ -781,6 +781,21 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra ...@@ -781,6 +781,21 @@ void phy_procedures_UE_TX(PHY_VARS_UE *phy_vars_ue,uint8_t eNB_id,uint8_t abstra
LOG_I(PHY,
"[UE %d][PUSCH %d] Frame %d subframe %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d\n",
Mod_id,harq_pid,frame_tx,subframe_tx,
first_rb,nb_rb,
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->round,
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->mcs,
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->rvidx,
(frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift+
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->n_DMRS2+
frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[slot_tx])%12,
frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.cyclicShift,
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->n_DMRS2,
frame_parms->pusch_config_common.ul_ReferenceSignalsPUSCH.nPRS[slot_tx],
phy_vars_ue->ulsch_ue[eNB_id]->o_ACK[0],phy_vars_ue->ulsch_ue[eNB_id]->o_ACK[1],
phy_vars_ue->ulsch_ue[eNB_id]->harq_processes[harq_pid]->O_ACK);
#ifdef DEBUG_PHY_PROC #ifdef DEBUG_PHY_PROC
LOG_D(PHY, LOG_D(PHY,
"[UE %d][PUSCH %d] Frame %d subframe %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d\n", "[UE %d][PUSCH %d] Frame %d subframe %d Generating PUSCH : first_rb %d, nb_rb %d, round %d, mcs %d, rv %d, cyclic_shift %d (cyclic_shift_common %d,n_DMRS2 %d,n_PRS %d), ACK (%d,%d), O_ACK %d\n",
......
...@@ -107,7 +107,7 @@ int errno; ...@@ -107,7 +107,7 @@ int errno;
# endif # endif
#endif #endif
//#define XER_PRINT #define XER_PRINT
extern Enb_properties_array_t enb_properties; extern Enb_properties_array_t enb_properties;
typedef struct xer_sprint_string_s { typedef struct xer_sprint_string_s {
...@@ -1298,6 +1298,11 @@ uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uin ...@@ -1298,6 +1298,11 @@ uint8_t do_RRCConnectionSetupComplete(uint8_t Mod_id, uint8_t *buffer, const uin
AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n", AssertFatal (enc_rval.encoded > 0, "ASN1 message encoding failed (%s, %lu)!\n",
enc_rval.failed_type->name, enc_rval.encoded); enc_rval.failed_type->name, enc_rval.encoded);
#ifdef XER_PRINT
xer_fprint(stdout, &asn_DEF_UL_DCCH_Message, (void*)&ul_dcch_msg);
#endif
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
# if !defined(DISABLE_XER_SPRINT) # if !defined(DISABLE_XER_SPRINT)
{ {
......
...@@ -103,7 +103,7 @@ extern UE_MAC_INST *UE_mac_inst; ...@@ -103,7 +103,7 @@ extern UE_MAC_INST *UE_mac_inst;
extern void *bigphys_malloc(int); extern void *bigphys_malloc(int);
#endif #endif
//#define XER_PRINT #define XER_PRINT
extern int8_t dB_fixed2(uint32_t x,uint32_t y); extern int8_t dB_fixed2(uint32_t x,uint32_t y);
......
...@@ -334,7 +334,7 @@ void print_opp_meas(void); ...@@ -334,7 +334,7 @@ void print_opp_meas(void);
int transmission_mode=1; int transmission_mode=1;
int16_t glog_level = LOG_INFO; int16_t glog_level = LOG_DEBUG;
int16_t glog_verbosity = LOG_MED; int16_t glog_verbosity = LOG_MED;
int16_t hw_log_level = LOG_INFO; int16_t hw_log_level = LOG_INFO;
int16_t hw_log_verbosity = LOG_MED; int16_t hw_log_verbosity = LOG_MED;
...@@ -2524,9 +2524,9 @@ int main( int argc, char **argv ) ...@@ -2524,9 +2524,9 @@ int main( int argc, char **argv )
set_comp_log(HW, LOG_INFO, LOG_HIGH, 1); set_comp_log(HW, LOG_INFO, LOG_HIGH, 1);
set_comp_log(PHY, LOG_INFO, LOG_HIGH, 1); set_comp_log(PHY, LOG_INFO, LOG_HIGH, 1);
set_comp_log(MAC, LOG_INFO, LOG_HIGH, 1); set_comp_log(MAC, LOG_DEBUG, LOG_HIGH, 1);
set_comp_log(RLC, LOG_INFO, LOG_HIGH, 1); set_comp_log(RLC, LOG_DEBUG, LOG_HIGH, 1);
set_comp_log(PDCP, LOG_INFO, LOG_HIGH, 1); set_comp_log(PDCP, LOG_DEBUG, LOG_HIGH, 1);
set_comp_log(OTG, LOG_INFO, LOG_HIGH, 1); set_comp_log(OTG, LOG_INFO, LOG_HIGH, 1);
set_comp_log(RRC, LOG_INFO, LOG_HIGH, 1); set_comp_log(RRC, LOG_INFO, LOG_HIGH, 1);
#if defined(ENABLE_ITTI) #if defined(ENABLE_ITTI)
...@@ -3019,7 +3019,7 @@ openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL; ...@@ -3019,7 +3019,7 @@ openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL;
openair0.type=EXMIMO_IF; openair0.type=EXMIMO_IF;
printf("Setting the HW to EXMIMO and initializing openair0 ...\n"); printf("Setting the HW to EXMIMO and initializing openair0 ...\n");
#elif OAI_USRP #elif OAI_USRP
openair0.type=USRP_IF; openair0.type=USRP_B200_IF;
printf("Setting the HW to USRP and initializing openair0 ...\n"); printf("Setting the HW to USRP and initializing openair0 ...\n");
#elif OAI_BLADERF #elif OAI_BLADERF
openair0.type=BLADERF_IF; openair0.type=BLADERF_IF;
...@@ -3107,7 +3107,7 @@ openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL; ...@@ -3107,7 +3107,7 @@ openair0_cfg[card].num_rb_dl=frame_parms[0]->N_RB_DL;
#ifdef OAI_USRP #ifdef OAI_USRP
openair_daq_vars.timing_advance = timing_advance; openair_daq_vars.timing_advance = timing_advance;
#else #else
openair_daq_vars.timing_advance = 160; openair_daq_vars.timing_advance = timing_advance;
#endif #endif
if (setup_ue_buffers(UE,&openair0_cfg[0],rf_map)!=0) { if (setup_ue_buffers(UE,&openair0_cfg[0],rf_map)!=0) {
printf("Error setting up eNB buffer\n"); printf("Error setting up eNB buffer\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment