From 54ff4d7bd017a5ca6f115b2c7a8f6ffab44923f4 Mon Sep 17 00:00:00 2001
From: Istvan Csomortani <istvan.csomortani@analog.com>
Date: Thu, 20 Apr 2017 18:50:00 +0300
Subject: [PATCH] ad_serdes_in: Fix generate block

---
 library/xilinx/common/ad_serdes_in.v | 399 ++++++++++++++-------------
 1 file changed, 203 insertions(+), 196 deletions(-)

diff --git a/library/xilinx/common/ad_serdes_in.v b/library/xilinx/common/ad_serdes_in.v
index 84520379f..dccc0d5e6 100644
--- a/library/xilinx/common/ad_serdes_in.v
+++ b/library/xilinx/common/ad_serdes_in.v
@@ -110,208 +110,215 @@ module ad_serdes_in #(
   // received data interface: ibuf -> idelay -> iserdes
 
   genvar l_inst;
-  generate
-  for (l_inst = 0; l_inst <= (DATA_WIDTH-1); l_inst = l_inst + 1) begin: g_data
+  generate if (DEVICE_TYPE == 0) begin
+    for (l_inst = 0; l_inst <= (DATA_WIDTH-1); l_inst = l_inst + 1) begin: g_data
 
-  IBUFDS i_ibuf (
-    .I (data_in_p[l_inst]),
-    .IB (data_in_n[l_inst]),
-    .O (data_in_ibuf_s[l_inst]));
+      IBUFDS i_ibuf (
+        .I (data_in_p[l_inst]),
+        .IB (data_in_n[l_inst]),
+        .O (data_in_ibuf_s[l_inst]));
 
-  if (DEVICE_TYPE == DEVICE_7SERIES) begin
-  (* IODELAY_GROUP = IODELAY_GROUP *)
-  IDELAYE2 #(
-    .CINVCTRL_SEL ("FALSE"),
-    .DELAY_SRC ("IDATAIN"),
-    .HIGH_PERFORMANCE_MODE ("FALSE"),
-    .IDELAY_TYPE ("VAR_LOAD"),
-    .IDELAY_VALUE (0),
-    .REFCLK_FREQUENCY (200.0),
-    .PIPE_SEL ("FALSE"),
-    .SIGNAL_PATTERN ("DATA"))
-  i_idelay (
-    .CE (1'b0),
-    .INC (1'b0),
-    .DATAIN (1'b0),
-    .LDPIPEEN (1'b0),
-    .CINVCTRL (1'b0),
-    .REGRST (1'b0),
-    .C (up_clk),
-    .IDATAIN (data_in_ibuf_s[l_inst]),
-    .DATAOUT (data_in_idelay_s[l_inst]),
-    .LD (up_dld[l_inst]),
-    .CNTVALUEIN (up_dwdata[((5*l_inst)+4):(5*l_inst)]),
-    .CNTVALUEOUT (up_drdata[((5*l_inst)+4):(5*l_inst)]));
-  end
-  if(DEVICE_TYPE == DEVICE_6SERIES) begin
-  (* IODELAY_GROUP = IODELAY_GROUP *)
-  IODELAYE1 #(
-    .CINVCTRL_SEL ("FALSE"),
-    .DELAY_SRC ("I"),
-    .HIGH_PERFORMANCE_MODE ("TRUE"),
-    .IDELAY_TYPE ("VAR_LOADABLE"),
-    .IDELAY_VALUE (0),
-    .ODELAY_TYPE ("FIXED"),
-    .ODELAY_VALUE (0),
-    .REFCLK_FREQUENCY (200.0),
-    .SIGNAL_PATTERN ("DATA"))
-  i_idelay (
-    .T (1'b1),
-    .CE (1'b0),
-    .INC (1'b0),
-    .CLKIN (1'b0),
-    .DATAIN (1'b0),
-    .ODATAIN (1'b0),
-    .CINVCTRL (1'b0),
-    .C (up_clk),
-    .IDATAIN (data_in_ibuf_s[l_inst]),
-    .DATAOUT (data_in_idelay_s[l_inst]),
-    .RST (up_dld[l_inst]),
-    .CNTVALUEIN (up_dwdata[((5*l_inst)+4):(5*l_inst)]),
-    .CNTVALUEOUT (up_drdata[((5*l_inst)+4):(5*l_inst)]));
-  end
+      (* IODELAY_GROUP = IODELAY_GROUP *)
+      IDELAYE2 #(
+        .CINVCTRL_SEL ("FALSE"),
+        .DELAY_SRC ("IDATAIN"),
+        .HIGH_PERFORMANCE_MODE ("FALSE"),
+        .IDELAY_TYPE ("VAR_LOAD"),
+        .IDELAY_VALUE (0),
+        .REFCLK_FREQUENCY (200.0),
+        .PIPE_SEL ("FALSE"),
+        .SIGNAL_PATTERN ("DATA"))
+      i_idelay (
+        .CE (1'b0),
+        .INC (1'b0),
+        .DATAIN (1'b0),
+        .LDPIPEEN (1'b0),
+        .CINVCTRL (1'b0),
+        .REGRST (1'b0),
+        .C (up_clk),
+        .IDATAIN (data_in_ibuf_s[l_inst]),
+        .DATAOUT (data_in_idelay_s[l_inst]),
+        .LD (up_dld[l_inst]),
+        .CNTVALUEIN (up_dwdata[((5*l_inst)+4):(5*l_inst)]),
+        .CNTVALUEOUT (up_drdata[((5*l_inst)+4):(5*l_inst)]));
 
-  if (DEVICE_TYPE == DEVICE_7SERIES) begin
-  ISERDESE2  #(
-    .DATA_RATE (DATA_RATE),
-    .DATA_WIDTH (SERDES_FACTOR),
-    .DYN_CLKDIV_INV_EN ("FALSE"),
-    .DYN_CLK_INV_EN ("FALSE"),
-    .INIT_Q1 (1'b0),
-    .INIT_Q2 (1'b0),
-    .INIT_Q3 (1'b0),
-    .INIT_Q4 (1'b0),
-    .INTERFACE_TYPE ("NETWORKING"),
-    .IOBDELAY ("IFD"),
-    .NUM_CE (2),
-    .OFB_USED ("FALSE"),
-    .SERDES_MODE ("MASTER"),
-    .SRVAL_Q1 (1'b0),
-    .SRVAL_Q2 (1'b0),
-    .SRVAL_Q3 (1'b0),
-    .SRVAL_Q4 (1'b0))
-  i_iserdes (
-    .O (),
-    .Q1 (data_s0[l_inst]),
-    .Q2 (data_s1[l_inst]),
-    .Q3 (data_s2[l_inst]),
-    .Q4 (data_s3[l_inst]),
-    .Q5 (data_s4[l_inst]),
-    .Q6 (data_s5[l_inst]),
-    .Q7 (data_s6[l_inst]),
-    .Q8 (data_s7[l_inst]),
-    .SHIFTOUT1 (),
-    .SHIFTOUT2 (),
-    .BITSLIP (1'b0),
-    .CE1 (1'b1),
-    .CE2 (1'b1),
-    .CLKDIVP (1'b0),
-    .CLK (clk),
-    .CLKB (~clk),
-    .CLKDIV (div_clk),
-    .OCLK (1'b0),
-    .DYNCLKDIVSEL (1'b0),
-    .DYNCLKSEL (1'b0),
-    .D (1'b0),
-    .DDLY (data_in_idelay_s[l_inst]),
-    .OFB (1'b0),
-    .OCLKB (1'b0),
-    .RST (rst),
-    .SHIFTIN1 (1'b0),
-    .SHIFTIN2 (1'b0));
-  end
-  if (DEVICE_TYPE == DEVICE_6SERIES) begin
-  ISERDESE1 #(
-    .DATA_RATE (DATA_RATE),
-    .DATA_WIDTH (SERDES_FACTOR),
-    .DYN_CLKDIV_INV_EN ("FALSE"),
-    .DYN_CLK_INV_EN ("FALSE"),
-    .INIT_Q1 (1'b0),
-    .INIT_Q2 (1'b0),
-    .INIT_Q3 (1'b0),
-    .INIT_Q4 (1'b0),
-    .INTERFACE_TYPE ("NETWORKING"),
-    .IOBDELAY ("NONE"),
-    .NUM_CE (1),
-    .OFB_USED ("FALSE"),
-    .SERDES_MODE ("MASTER"),
-    .SRVAL_Q1 (1'b0),
-    .SRVAL_Q2 (1'b0),
-    .SRVAL_Q3 (1'b0),
-    .SRVAL_Q4 (1'b0))
-  i_iserdes_m (
-    .O (),
-    .Q1 (data_s0[l_inst]),
-    .Q2 (data_s1[l_inst]),
-    .Q3 (data_s2[l_inst]),
-    .Q4 (data_s3[l_inst]),
-    .Q5 (data_s4[l_inst]),
-    .Q6 (data_s5[l_inst]),
-    .SHIFTOUT1 (data_shift1_s[l_inst]),
-    .SHIFTOUT2 (data_shift2_s[l_inst]),
-    .BITSLIP (1'b0),
-    .CE1 (1'b1),
-    .CE2 (1'b1),
-    .CLK (clk),
-    .CLKB (~clk),
-    .CLKDIV (div_clk),
-    .OCLK (1'b0),
-    .DYNCLKDIVSEL (1'b0),
-    .DYNCLKSEL (1'b0),
-    .D (1'b0),
-    .DDLY (data_in_idelay_s[l_inst]),
-    .OFB (1'b0),
-    .RST (rst),
-    .SHIFTIN1 (1'b0),
-    .SHIFTIN2 (1'b0));
+      ISERDESE2  #(
+        .DATA_RATE (DATA_RATE),
+        .DATA_WIDTH (SERDES_FACTOR),
+        .DYN_CLKDIV_INV_EN ("FALSE"),
+        .DYN_CLK_INV_EN ("FALSE"),
+        .INIT_Q1 (1'b0),
+        .INIT_Q2 (1'b0),
+        .INIT_Q3 (1'b0),
+        .INIT_Q4 (1'b0),
+        .INTERFACE_TYPE ("NETWORKING"),
+        .IOBDELAY ("IFD"),
+        .NUM_CE (2),
+        .OFB_USED ("FALSE"),
+        .SERDES_MODE ("MASTER"),
+        .SRVAL_Q1 (1'b0),
+        .SRVAL_Q2 (1'b0),
+        .SRVAL_Q3 (1'b0),
+        .SRVAL_Q4 (1'b0))
+      i_iserdes (
+        .O (),
+        .Q1 (data_s0[l_inst]),
+        .Q2 (data_s1[l_inst]),
+        .Q3 (data_s2[l_inst]),
+        .Q4 (data_s3[l_inst]),
+        .Q5 (data_s4[l_inst]),
+        .Q6 (data_s5[l_inst]),
+        .Q7 (data_s6[l_inst]),
+        .Q8 (data_s7[l_inst]),
+        .SHIFTOUT1 (),
+        .SHIFTOUT2 (),
+        .BITSLIP (1'b0),
+        .CE1 (1'b1),
+        .CE2 (1'b1),
+        .CLKDIVP (1'b0),
+        .CLK (clk),
+        .CLKB (~clk),
+        .CLKDIV (div_clk),
+        .OCLK (1'b0),
+        .DYNCLKDIVSEL (1'b0),
+        .DYNCLKSEL (1'b0),
+        .D (1'b0),
+        .DDLY (data_in_idelay_s[l_inst]),
+        .OFB (1'b0),
+        .OCLKB (1'b0),
+        .RST (rst),
+        .SHIFTIN1 (1'b0),
+        .SHIFTIN2 (1'b0));
+      end /* g_data */
 
-  ISERDESE1 #(
-    .DATA_RATE (DATA_RATE),
-    .DATA_WIDTH (SERDES_FACTOR),
-    .DYN_CLKDIV_INV_EN ("FALSE"),
-    .DYN_CLK_INV_EN ("FALSE"),
-    .INIT_Q1 (1'b0),
-    .INIT_Q2 (1'b0),
-    .INIT_Q3 (1'b0),
-    .INIT_Q4 (1'b0),
-    .INTERFACE_TYPE ("NETWORKING"),
-    .IOBDELAY ("NONE"),
-    .NUM_CE (1),
-    .OFB_USED ("FALSE"),
-    .SERDES_MODE ("SLAVE"),
-    .SRVAL_Q1 (1'b0),
-    .SRVAL_Q2 (1'b0),
-    .SRVAL_Q3 (1'b0),
-    .SRVAL_Q4 (1'b0))
-  i_iserdes_s (
-    .O (),
-    .Q1 (),
-    .Q2 (),
-    .Q3 (data_s6[l_inst]),
-    .Q4 (data_s7[l_inst]),
-    .Q5 (),
-    .Q6 (),
-    .SHIFTOUT1 (),
-    .SHIFTOUT2 (),
-    .BITSLIP (1'b0),
-    .CE1 (1'b1),
-    .CE2 (1'b1),
-    .CLK (clk),
-    .CLKB (~clk),
-    .CLKDIV (div_clk),
-    .OCLK (1'b0),
-    .DYNCLKDIVSEL (1'b0),
-    .DYNCLKSEL (1'b0),
-    .D (1'b0),
-    .DDLY (data_in_idelay_s[l_inst]),
-    .OFB (1'b0),
-    .RST (rst),
-    .SHIFTIN1 (data_shift1_s[l_inst]),
-    .SHIFTIN2 (data_shift2_s[l_inst]));
-  end
-  end
+    end else begin
+
+    for (l_inst = 0; l_inst <= (DATA_WIDTH-1); l_inst = l_inst + 1) begin: g_data
+
+      IBUFDS i_ibuf (
+        .I (data_in_p[l_inst]),
+        .IB (data_in_n[l_inst]),
+        .O (data_in_ibuf_s[l_inst]));
+
+      (* IODELAY_GROUP = IODELAY_GROUP *)
+      IODELAYE1 #(
+        .CINVCTRL_SEL ("FALSE"),
+        .DELAY_SRC ("I"),
+        .HIGH_PERFORMANCE_MODE ("TRUE"),
+        .IDELAY_TYPE ("VAR_LOADABLE"),
+        .IDELAY_VALUE (0),
+        .ODELAY_TYPE ("FIXED"),
+        .ODELAY_VALUE (0),
+        .REFCLK_FREQUENCY (200.0),
+        .SIGNAL_PATTERN ("DATA"))
+      i_idelay (
+        .T (1'b1),
+        .CE (1'b0),
+        .INC (1'b0),
+        .CLKIN (1'b0),
+        .DATAIN (1'b0),
+        .ODATAIN (1'b0),
+        .CINVCTRL (1'b0),
+        .C (up_clk),
+        .IDATAIN (data_in_ibuf_s[l_inst]),
+        .DATAOUT (data_in_idelay_s[l_inst]),
+        .RST (up_dld[l_inst]),
+        .CNTVALUEIN (up_dwdata[((5*l_inst)+4):(5*l_inst)]),
+        .CNTVALUEOUT (up_drdata[((5*l_inst)+4):(5*l_inst)]));
+
+      ISERDESE1 #(
+        .DATA_RATE (DATA_RATE),
+        .DATA_WIDTH (SERDES_FACTOR),
+        .DYN_CLKDIV_INV_EN ("FALSE"),
+        .DYN_CLK_INV_EN ("FALSE"),
+        .INIT_Q1 (1'b0),
+        .INIT_Q2 (1'b0),
+        .INIT_Q3 (1'b0),
+        .INIT_Q4 (1'b0),
+        .INTERFACE_TYPE ("NETWORKING"),
+        .IOBDELAY ("NONE"),
+        .NUM_CE (1),
+        .OFB_USED ("FALSE"),
+        .SERDES_MODE ("MASTER"),
+        .SRVAL_Q1 (1'b0),
+        .SRVAL_Q2 (1'b0),
+        .SRVAL_Q3 (1'b0),
+        .SRVAL_Q4 (1'b0))
+      i_iserdes_m (
+        .O (),
+        .Q1 (data_s0[l_inst]),
+        .Q2 (data_s1[l_inst]),
+        .Q3 (data_s2[l_inst]),
+        .Q4 (data_s3[l_inst]),
+        .Q5 (data_s4[l_inst]),
+        .Q6 (data_s5[l_inst]),
+        .SHIFTOUT1 (data_shift1_s[l_inst]),
+        .SHIFTOUT2 (data_shift2_s[l_inst]),
+        .BITSLIP (1'b0),
+        .CE1 (1'b1),
+        .CE2 (1'b1),
+        .CLK (clk),
+        .CLKB (~clk),
+        .CLKDIV (div_clk),
+        .OCLK (1'b0),
+        .DYNCLKDIVSEL (1'b0),
+        .DYNCLKSEL (1'b0),
+        .D (1'b0),
+        .DDLY (data_in_idelay_s[l_inst]),
+        .OFB (1'b0),
+        .RST (rst),
+        .SHIFTIN1 (1'b0),
+        .SHIFTIN2 (1'b0));
+
+      ISERDESE1 #(
+        .DATA_RATE (DATA_RATE),
+        .DATA_WIDTH (SERDES_FACTOR),
+        .DYN_CLKDIV_INV_EN ("FALSE"),
+        .DYN_CLK_INV_EN ("FALSE"),
+        .INIT_Q1 (1'b0),
+        .INIT_Q2 (1'b0),
+        .INIT_Q3 (1'b0),
+        .INIT_Q4 (1'b0),
+        .INTERFACE_TYPE ("NETWORKING"),
+        .IOBDELAY ("NONE"),
+        .NUM_CE (1),
+        .OFB_USED ("FALSE"),
+        .SERDES_MODE ("SLAVE"),
+        .SRVAL_Q1 (1'b0),
+        .SRVAL_Q2 (1'b0),
+        .SRVAL_Q3 (1'b0),
+        .SRVAL_Q4 (1'b0))
+      i_iserdes_s (
+        .O (),
+        .Q1 (),
+        .Q2 (),
+        .Q3 (data_s6[l_inst]),
+        .Q4 (data_s7[l_inst]),
+        .Q5 (),
+        .Q6 (),
+        .SHIFTOUT1 (),
+        .SHIFTOUT2 (),
+        .BITSLIP (1'b0),
+        .CE1 (1'b1),
+        .CE2 (1'b1),
+        .CLK (clk),
+        .CLKB (~clk),
+        .CLKDIV (div_clk),
+        .OCLK (1'b0),
+        .DYNCLKDIVSEL (1'b0),
+        .DYNCLKSEL (1'b0),
+        .D (1'b0),
+        .DDLY (data_in_idelay_s[l_inst]),
+        .OFB (1'b0),
+        .RST (rst),
+        .SHIFTIN1 (data_shift1_s[l_inst]),
+        .SHIFTIN2 (data_shift2_s[l_inst]));
+
+      end /* g_data */
+    end
   endgenerate
 
+
 endmodule
 
 // ***************************************************************************