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
@@ -994,7 +994,7 @@ int main( int argc, char **argv ) {
                 (void *)NULL, "time_meas", -1, OAI_PRIORITY_RT_LOW);
  }

-  if(IS_SOFTMODEM_DOFORMS) {
+  if(IS_SOFTMODEM_DOSCOPE) {
    scopeParms_t tmp= {&argc, argv, &ru, RC.gNB[0]};
    load_softscope("nr",&tmp);
  }