integration fix: let ulsim compile again + minor modification in dlsim_tm4

openair1/SIMULATION/LTE_PHY/dlsim_tm4.c

@@ -297,8 +297,6 @@ int main(int argc, char **argv)
 
   int threequarter_fs=0;
 
-  cpuf = get_cpu_freq_GHz();
-
   opp_enabled=1; // to enable the time meas
 
 #if defined(__arm__)
@@ -317,6 +315,8 @@ int main(int argc, char **argv)
 #else
   cpu_freq_GHz = get_cpu_freq_GHz();
 #endif
+  cpuf = cpu_freq_GHz;
+
   printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz);
 
   //signal(SIGSEGV, handler);

openair1/SIMULATION/LTE_PHY/ulsim.c

@@ -50,6 +50,7 @@
 PHY_VARS_eNB *eNB;
 PHY_VARS_UE *UE;
 
+double cpuf;
 
 
 
@@ -280,6 +281,7 @@ int main(int argc, char **argv)
   opp_enabled=1; // to enable the time meas
 
   cpu_freq_GHz = (double)get_cpu_freq_GHz();
+  cpuf = cpu_freq_GHz;
 
   printf("Detected cpu_freq %f GHz\n",cpu_freq_GHz);