Merge remote-tracking branch 'origin/bugfix-222' into develop_integration_w13

2017-03-28 16:20:21 +02:00
parent 740d3f647d 002b9b0f65
commit 2af0ef847b
1 changed files with 7 additions and 1 deletions
@@ -633,7 +633,13 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
      }
      if(SR_payload == 1)
      {
-          return pucch_format1;
+          if (frame_type == FDD) {
+              return pucch_format1;
+          } else if (frame_type == TDD) {
+              return pucch_format1b;
+          } else {
+	      AssertFatal(1==0,"Unknown frame_type");
+          }
      }
  }
  else