Fix code review remarks, merge develop, revert some merge errors

2021-04-13 22:28:02 +02:00
parent 04f2ec2352
commit 86f1c69f26
49 changed files with 359 additions and 219 deletions
@@ -472,7 +472,7 @@ int main( int argc, char **argv ) {
  configure_linux();
  mlockall(MCL_CURRENT | MCL_FUTURE);
 
-  if(IS_SOFTMODEM_DOFORMS) { 
+  if(IS_SOFTMODEM_DOSCOPE) { 
    load_softscope("nr",PHY_vars_UE_g[0][0]);
  }