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

2af0ef84 · Cedric Roux · 740d3f64 · 002b9b0f · 2af0ef84
Commit 2af0ef84 authored Mar 28, 2017 by Cedric Roux
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

openair1/SCHED/phy_procedures_lte_ue.c openair1/SCHED/phy_procedures_lte_ue.c +7 -1

No files found.
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
@@ -633,7 +633,13 @@ PUCCH_FMT_t get_pucch_format(lte_frame_type_t frame_type,
      }
      if(SR_payload == 1)
      {
+          if (frame_type == FDD) {
              return pucch_format1;
+          } else if (frame_type == TDD) {
+              return pucch_format1b;
+          } else {
+	      AssertFatal(1==0,"Unknown frame_type");
+          }
      }
  }
  else