fix for pucchsim (from cedric)
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7808 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
@@ -1848,6 +1848,7 @@ target_link_libraries (oaisim_nos1 forms)
|
|||||||
|
|
||||||
foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
|
foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
|
||||||
add_executable(${myExe}
|
add_executable(${myExe}
|
||||||
|
${OPENAIR_BIN_DIR}/messages_xml.h
|
||||||
${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
|
${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
|
||||||
${XFORMS_SOURCE}
|
${XFORMS_SOURCE}
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -44,6 +44,7 @@
|
|||||||
#include "SCHED/defs.h"
|
#include "SCHED/defs.h"
|
||||||
#include "SCHED/vars.h"
|
#include "SCHED/vars.h"
|
||||||
#include "LAYER2/MAC/vars.h"
|
#include "LAYER2/MAC/vars.h"
|
||||||
|
#include "intertask_interface_init.h"
|
||||||
|
|
||||||
#include "OCG_vars.h"
|
#include "OCG_vars.h"
|
||||||
#include "UTIL/LOG/log_extern.h"
|
#include "UTIL/LOG/log_extern.h"
|
||||||
@@ -157,7 +158,7 @@ int main(int argc, char **argv)
|
|||||||
int32_t stat;
|
int32_t stat;
|
||||||
double stat_no_sig,stat_sig;
|
double stat_no_sig,stat_sig;
|
||||||
uint8_t N0=40;
|
uint8_t N0=40;
|
||||||
uint8_t pucch1_thres=13;
|
uint8_t pucch1_thres=10;
|
||||||
|
|
||||||
uint16_t n1_pucch = 0;
|
uint16_t n1_pucch = 0;
|
||||||
uint16_t n2_pucch = 0;
|
uint16_t n2_pucch = 0;
|
||||||
@@ -362,6 +363,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
|
|
||||||
logInit();
|
logInit();
|
||||||
|
itti_init(TASK_MAX, THREAD_MAX, MESSAGES_ID_MAX, tasks_info, messages_info, messages_definition_xml, NULL);
|
||||||
g_log->log_component[PHY].level = LOG_DEBUG;
|
g_log->log_component[PHY].level = LOG_DEBUG;
|
||||||
g_log->log_component[PHY].flag = LOG_HIGH;
|
g_log->log_component[PHY].flag = LOG_HIGH;
|
||||||
|
|
||||||
@@ -573,11 +575,11 @@ int main(int argc, char **argv)
|
|||||||
sig=1;
|
sig=1;
|
||||||
} else {
|
} else {
|
||||||
if (trial<(n_frames>>1)) {
|
if (trial<(n_frames>>1)) {
|
||||||
// printf("no sig =>");
|
//printf("no sig =>");
|
||||||
sig= 0;
|
sig= 0;
|
||||||
} else {
|
} else {
|
||||||
sig=1;
|
sig=1;
|
||||||
// printf("sig =>");
|
//printf("sig =>");
|
||||||
pucch_tx++;
|
pucch_tx++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user