Change tdctemplate design to 32pin AddOn

diff --git a/pinout/trb3sc_32pin.lpf b/pinout/trb3sc_32pin.lpf
new file mode 100644 (file)
index 0000000..eb8d60f
--- /dev/null
+++ b/pinout/trb3sc_32pin.lpf
@@ -0,0 +1,633 @@
+#################################################################\r
+# Clock I/O\r
+#################################################################\r
+LOCATE COMP "CLK_SUPPL_PLL_RIGHT"            SITE "Y28";           #was SUPPL_CLOCK1_P\r
+LOCATE COMP "CLK_SUPPL_PLL_LEFT"             SITE "Y9";            #was SUPPL_CLOCK2_P\r
+LOCATE COMP "CLK_SUPPL_PCLK"                 SITE "V9";            #was SUPPL_CLOCK3_P\r
+LOCATE COMP "CLK_CORE_PCLK"                  SITE "U9";            #was "CORE_CLOCK0_P"\r
+LOCATE COMP "CLK_CORE_PLL_LEFT"              SITE "U6";            #was "CORE_CLOCK1_P"\r
+LOCATE COMP "CLK_CORE_PLL_RIGHT"             SITE "V34";           #was "CORE_CLOCK2_P"\r
+LOCATE COMP "CLK_EXT_PCLK"                   SITE "U28";           #was "EXT_CLOCK0_P"\r
+LOCATE COMP "CLK_EXT_PLL_RIGHT"              SITE "P30";           #was "EXT_CLOCK1_P"\r
+LOCATE COMP "CLK_EXT_PLL_LEFT"               SITE "N7";            #was "EXT_CLOCK2_P"\r
+DEFINE PORT GROUP "CLK_group" "CLK*" ;\r
+IOBUF GROUP  "CLK_group" IO_TYPE=LVDS25  DIFFRESISTOR=100;\r
+\r
+\r
+LOCATE COMP "TRIG_PLL"                       SITE "AJ34";\r
+LOCATE COMP "TRIG_RIGHT"                     SITE "P34";\r
+LOCATE COMP "TRIG_LEFT"                      SITE "T6";\r
+DEFINE PORT GROUP "TRIG_group" "TRIG*" ;\r
+IOBUF GROUP  "TRIG_group" IO_TYPE=LVDS25  DIFFRESISTOR=100;\r
+\r
+\r
+\r
+\r
+#################################################################\r
+# Backplane I/O\r
+#################################################################\r
+LOCATE COMP "BACK_GPIO_0"                    SITE "C26";\r
+LOCATE COMP "BACK_GPIO_1"                    SITE "D26";\r
+LOCATE COMP "BACK_GPIO_2"                    SITE "B27";\r
+LOCATE COMP "BACK_GPIO_3"                    SITE "C27";\r
+# LOCATE COMP "BACK_GPIO_4"                    SITE "D27";\r
+# LOCATE COMP "BACK_GPIO_5"                    SITE "E27";\r
+# LOCATE COMP "BACK_GPIO_6"                    SITE "B28";\r
+# LOCATE COMP "BACK_GPIO_7"                    SITE "A28";\r
+# LOCATE COMP "BACK_GPIO_8"                    SITE "A26";\r
+# LOCATE COMP "BACK_GPIO_9"                    SITE "A27";\r
+# LOCATE COMP "BACK_GPIO_10"                   SITE "A29";\r
+# LOCATE COMP "BACK_GPIO_11"                   SITE "A30";\r
+# LOCATE COMP "BACK_GPIO_12"                   SITE "H26";\r
+# LOCATE COMP "BACK_GPIO_13"                   SITE "H25";\r
+# LOCATE COMP "BACK_GPIO_14"                   SITE "A31";\r
+# LOCATE COMP "BACK_GPIO_15"                   SITE "B31";\r
+DEFINE PORT GROUP "BACK_GPIO_group" "BACK_GPIO*" ;\r
+IOBUF GROUP  "BACK_GPIO_group" IO_TYPE=LVCMOS25 PULLMODE=UP;\r
+\r
+# LOCATE COMP "BACK_LVDS_0"                   SITE "V2";\r
+# LOCATE COMP "BACK_LVDS_1"                   SITE "T4";\r
+# # LOCATE COMP "BACK_LVDS_0_N"                   SITE "V1";\r
+# # LOCATE COMP "BACK_LVDS_1_N"                   SITE "T3";\r
+# DEFINE PORT GROUP "BACK_LVDS_group" "BACK_LVDS*" ;\r
+# IOBUF GROUP  "BACK_LVDS_group" IO_TYPE=LVDS25;\r
+# \r
+# LOCATE COMP "BACK_3V3_0"                    SITE "E11";\r
+# LOCATE COMP "BACK_3V3_1"                    SITE "F12";\r
+# LOCATE COMP "BACK_3V3_2"                    SITE "F10";\r
+# LOCATE COMP "BACK_3V3_3"                    SITE "E10";\r
+# DEFINE PORT GROUP "BACK_3V3_group" "BACK_3V3*" ;\r
+# IOBUF GROUP  "BACK_3V3_group" IO_TYPE=LVTTL33 PULLMODE=DOWN;\r
+\r
+#################################################################\r
+# AddOn Connector\r
+#################################################################\r
+# # LOCATE COMP "DQLL0_0_N"                      SITE "AA1";\r
+# # LOCATE COMP "DQLL0_1_N"                      SITE "AB1";\r
+# # LOCATE COMP "DQLL0_2_N"                      SITE "AA3";\r
+# # LOCATE COMP "DQLL0_3_N"                      SITE "AB5";\r
+# # LOCATE COMP "DQLL0_4_N"                      SITE "AA7";\r
+# # LOCATE COMP "DQLL1_0_N"                      SITE "Y1";\r
+# # LOCATE COMP "DQLL1_1_N"                      SITE "W3";\r
+# # LOCATE COMP "DQLL1_2_N"                      SITE "W1";\r
+# # LOCATE COMP "DQLL1_3_N"                      SITE "W9";\r
+# # LOCATE COMP "DQLL1_4_N"                      SITE "AA8";\r
+# # LOCATE COMP "DQLL2_0_N"                      SITE "AC4";\r
+# # LOCATE COMP "DQLL2_1_N"                      SITE "AC1";\r
+# # LOCATE COMP "DQLL2_2_N"                      SITE "AB3";\r
+# # LOCATE COMP "DQLL2_3_N"                      SITE "AB8";\r
+# # LOCATE COMP "DQLL2_4_N"                      SITE "AB6";\r
+# # LOCATE COMP "DQLL3_0_N"                      SITE "AE3";\r
+# # LOCATE COMP "DQLL3_1_N"                      SITE "AC10"\r
+# # LOCATE COMP "DQLL3_2_N"                      SITE "AE1";\r
+# # LOCATE COMP "DQLL3_3_N"                      SITE "AD3";\r
+# # LOCATE COMP "DQLL3_4_N"                      SITE "AC8";\r
+# # LOCATE COMP "DQLR0_0_N"                      SITE "AB33"\r
+# # LOCATE COMP "DQLR0_1_N"                      SITE "AA26"\r
+# # LOCATE COMP "DQLR0_2_N"                      SITE "AC33"\r
+# # LOCATE COMP "DQLR0_3_N"                      SITE "AA30"\r
+# # LOCATE COMP "DQLR0_4_N"                      SITE "AA27"\r
+# # LOCATE COMP "DQLR1_0_N"                      SITE "AD30"\r
+# # LOCATE COMP "DQLR1_1_N"                      SITE "AB31"\r
+# # LOCATE COMP "DQLR1_2_N"                      SITE "AE33"\r
+# # LOCATE COMP "DQLR1_3_N"                      SITE "AD34"\r
+# # LOCATE COMP "DQLR1_4_N"                      SITE "AG34"\r
+# # LOCATE COMP "DQLR2_0_N"                      SITE "W29";\r
+# # LOCATE COMP "DQLR2_1_N"                      SITE "W26";\r
+# # LOCATE COMP "DQLR2_2_N"                      SITE "W33";;\r
+# # LOCATE COMP "DQLR2_3_N"                      SITE "Y33";;\r
+# # LOCATE COMP "DQLR2_4_N"                      SITE "Y25";\r
+# # LOCATE COMP "DQSLL0_C"                       SITE "AB9";\r
+# # LOCATE COMP "DQSLL1_C"                       SITE "Y6";\r
+# # LOCATE COMP "DQSLL2_C"                       SITE "AE5";\r
+# # LOCATE COMP "DQSLL3_C"                       SITE "AK1";\r
+# # LOCATE COMP "DQSLR0_C"                       SITE "AC30"\r
+# # LOCATE COMP "DQSLR1_C"                       SITE "AB25";\r
+# # LOCATE COMP "DQSLR2_C"                       SITE "AA29";\r
+# # LOCATE COMP "DQSUL0_C"                       SITE "M9";;\r
+# # LOCATE COMP "DQSUL1_C"                       SITE "L9";;\r
+# # LOCATE COMP "DQSUL2_C"                       SITE "H3";;\r
+# # LOCATE COMP "DQSUL3_C"                       SITE "N10";;\r
+# # LOCATE COMP "DQSUR0_C"                       SITE "M27";;\r
+# # LOCATE COMP "DQSUR1_C"                       SITE "N28";;\r
+# # LOCATE COMP "DQSUR2_C"                       SITE "U30";;\r
+# # LOCATE COMP "DQUL0_0_N"                      SITE "L4";;\r
+# # LOCATE COMP "DQUL0_1_N"                      SITE "M3";;\r
+# # LOCATE COMP "DQUL0_2_N"                      SITE "K5";;\r
+# # LOCATE COMP "DQUL0_3_N"                      SITE "M1";;\r
+# # LOCATE COMP "DQUL0_4_N"                      SITE "L6";;\r
+# # LOCATE COMP "DQUL1_0_N"                      SITE "L1";;\r
+# # LOCATE COMP "DQUL1_1_N"                      SITE "K1";;\r
+# # LOCATE COMP "DQUL1_2_N"                      SITE "K3";;\r
+# # LOCATE COMP "DQUL1_3_N"                      SITE "L7";;\r
+# # LOCATE COMP "DQUL1_4_N"                      SITE "J6";;\r
+# # LOCATE COMP "DQUL2_0_N"                      SITE "F1";;\r
+# # LOCATE COMP "DQUL2_1_N"                      SITE "E3";\r
+# # LOCATE COMP "DQUL2_2_N"                      SITE "G1";\r
+# # LOCATE COMP "DQUL2_3_N"                      SITE "J1";\r
+# # LOCATE COMP "DQUL2_4_N"                      SITE "H2";\r
+# # LOCATE COMP "DQUL3_0_N"                      SITE "N3";\r
+# # LOCATE COMP "DQUL3_1_N"                      SITE "N1";\r
+# # LOCATE COMP "DQUL3_2_N"                      SITE "N5";\r
+# # LOCATE COMP "DQUL3_3_N"                      SITE "P4";\r
+# # LOCATE COMP "DQUL3_4_N"                      SITE "P8";\r
+# # LOCATE COMP "DQUR0_0_N"                      SITE "M25";\r
+# # LOCATE COMP "DQUR0_1_N"                      SITE "L31";\r
+# # LOCATE COMP "DQUR0_2_N"                      SITE "L33";;\r
+# # LOCATE COMP "DQUR0_3_N"                      SITE "K30";\r
+# # LOCATE COMP "DQUR0_4_N"                      SITE "K33";\r
+# # LOCATE COMP "DQUR1_0_N"                      SITE "N29";\r
+# # LOCATE COMP "DQUR1_1_N"                      SITE "P26";\r
+# # LOCATE COMP "DQUR1_2_N"                      SITE "N31";\r
+# # LOCATE COMP "DQUR1_3_N"                      SITE "N33";\r
+# # LOCATE COMP "DQUR1_4_N"                      SITE "P27";;\r
+# # LOCATE COMP "DQUR2_0_N"                      SITE "T31";;\r
+# # LOCATE COMP "DQUR2_1_N"                      SITE "T27";;\r
+# # LOCATE COMP "DQUR2_2_N"                      SITE "U31";;\r
+# # LOCATE COMP "DQUR2_3_N"                      SITE "T33";;\r
+# # LOCATE COMP "DQUR2_4_N"                      SITE "U27";\r
+# \r
+# LOCATE COMP "DQLL0_0"                      SITE "AA2";    #was "DQLL0_0_P" 1\r
+# LOCATE COMP "DQLL0_1"                      SITE "AB2";    #was "DQLL0_1_P" 5\r
+# LOCATE COMP "DQLL0_2"                      SITE "AA4";    #was "DQLL0_2_P" 9\r
+# LOCATE COMP "DQSLL0"                       SITE "AA10";   #was "DQSLL0_T"  13\r
+# LOCATE COMP "DQLL0_3"                      SITE "AA5";    #was "DQLL0_3_P" 17\r
+# LOCATE COMP "DQLL0_4"                      SITE "Y7";     #was "DQLL0_4_P" 21\r
+# LOCATE COMP "DQLL2_0"                      SITE "AC5";    #was "DQLL2_0_P" 25\r
+# LOCATE COMP "DQLL2_1"                      SITE "AC2";    #was "DQLL2_1_P" 29\r
+# LOCATE COMP "DQLL2_2"                      SITE "AB4";    #was "DQLL2_2_P" 33\r
+# LOCATE COMP "DQSLL2"                       SITE "AD5";    #was "DQSLL2_T"  37\r
+# LOCATE COMP "DQLL2_3"                      SITE "AA9";    #was "DQLL2_3_P" 41\r
+# LOCATE COMP "DQLL2_4"                      SITE "AB7";    #was "DQLL2_4_P" 45\r
+# LOCATE COMP "DQUL3_0"                      SITE "N4";     #was "DQUL3_0_P" 49\r
+# LOCATE COMP "DQUL3_1"                      SITE "N2";     #was "DQUL3_1_P" 53\r
+# LOCATE COMP "DQUL3_2"                      SITE "M5";     #was "DQUL3_2_P" 57\r
+# LOCATE COMP "DQSUL3"                       SITE "M10";    #was "DQSUL3_T"  61\r
+# LOCATE COMP "DQUL3_3"                      SITE "P5";     #was "DQUL3_3_P" 65\r
+# LOCATE COMP "DQUL3_4"                      SITE "N8";     #was "DQUL3_4_P" 69\r
+# LOCATE COMP "DQUL1_0"                      SITE "L2";     #was "DQUL1_0_P" 73\r
+# LOCATE COMP "DQUL1_1"                      SITE "K2";     #was "DQUL1_1_P" 77\r
+# LOCATE COMP "DQUL1_2"                      SITE "K4";     #was "DQUL1_2_P" 81\r
+# LOCATE COMP "DQSUL1"                       SITE "L10";    #was "DQSUL1_T"  85\r
+# LOCATE COMP "DQUL1_3"                      SITE "M8";     #was "DQUL1_3_P" 89\r
+# LOCATE COMP "DQUL1_4"                      SITE "K7";     #was "DQUL1_4_P" 93\r
+# \r
+# LOCATE COMP "DQUR0_0"                      SITE "L26";    #was "DQUR0_0_P" 105\r
+# LOCATE COMP "DQUR0_1"                      SITE "L32";    #was "DQUR0_1_P" 109\r
+# LOCATE COMP "DQSUR0"                       SITE "M26";    #was "DQSUR0_T"  113\r
+# LOCATE COMP "DQUR0_2"                      SITE "L34";    #was "DQUR0_2_P" 117\r
+# LOCATE COMP "DQUR0_3"                      SITE "K29";    #was "DQUR0_3_P" 121\r
+# LOCATE COMP "DQUR0_4"                      SITE "K34";    #was "DQUR0_4_P" 125\r
+# LOCATE COMP "DQLR0_0"                      SITE "AB34";   #was "DQLR0_0_P" 129\r
+# LOCATE COMP "DQLR0_1"                      SITE "AA25";   #was "DQLR0_1_P" 133\r
+# LOCATE COMP "DQLR0_2"                      SITE "AC34";   #was "DQLR0_2_P" 137\r
+# LOCATE COMP "DQSLR0"                       SITE "AB30";   #was "DQSLR0_T"  141\r
+# LOCATE COMP "DQLR0_3"                      SITE "AA31";   #was "DQLR0_3_P" 145\r
+# LOCATE COMP "DQLR0_4"                      SITE "AA28";   #was "DQLR0_4_P" 149\r
+# \r
+# LOCATE COMP "DQLR1_0"                      SITE "AD31";   #was "DQLR1_0_P" 169\r
+# LOCATE COMP "DQLR1_1"                      SITE "AB32";   #was "DQLR1_1_P" 173\r
+# LOCATE COMP "DQLR1_2"                      SITE "AE34";   #was "DQLR1_2_P" 177\r
+# LOCATE COMP "DQSLR1"                       SITE "AB26";   #was "DQSLR1_T"  181\r
+# LOCATE COMP "DQLR1_3"                      SITE "AD33";   #was "DQLR1_3_P" 185\r
+# LOCATE COMP "DQLR1_4"                      SITE "AF34";   #was "DQLR1_4_P" 189\r
+# \r
+# \r
+# LOCATE COMP "DQLL3_0"                      SITE "AE4";    #was "DQLL3_0_P" 2\r
+# LOCATE COMP "DQLL3_1"                      SITE "AB10";   #was "DQLL3_1_P" 6\r
+# LOCATE COMP "DQLL3_2"                      SITE "AE2";    #was "DQLL3_2_P" 10\r
+# LOCATE COMP "DQSLL3"                       SITE "AJ1";    #was "DQSLL3_T"  14\r
+# LOCATE COMP "DQLL3_3"                      SITE "AD4";    #was "DQLL3_3_P" 18\r
+# LOCATE COMP "DQLL3_4"                      SITE "AC9";    #was "DQLL3_4_P" 22\r
+# LOCATE COMP "DQLL1_0"                      SITE "Y2";     #was "DQLL1_0_P" 26\r
+# LOCATE COMP "DQLL1_1"                      SITE "W4";     #was "DQLL1_1_P" 30\r
+# LOCATE COMP "DQLL1_2"                      SITE "W2";     #was "DQLL1_2_P" 34\r
+# LOCATE COMP "DQSLL1"                       SITE "W6";     #was "DQSLL1_T"  38\r
+# LOCATE COMP "DQLL1_3"                      SITE "W8";     #was "DQLL1_3_P" 42\r
+# LOCATE COMP "DQLL1_4"                      SITE "Y8";     #was "DQLL1_4_P" 46\r
+# LOCATE COMP "DQUL2_0"                      SITE "F2";     #was "DQUL2_0_P" 50\r
+# LOCATE COMP "DQUL2_1"                      SITE "F3";     #was "DQUL2_1_P" 54\r
+# LOCATE COMP "DQUL2_2"                      SITE "G2";     #was "DQUL2_2_P" 58\r
+# LOCATE COMP "DQSUL2"                       SITE "G3";     #was "DQSUL2_T"  62\r
+# LOCATE COMP "DQUL2_3"                      SITE "H1";     #was "DQUL2_3_P" 66\r
+# LOCATE COMP "DQUL2_4"                      SITE "J3";     #was "DQUL2_4_P" 70\r
+# LOCATE COMP "DQUL0_0"                      SITE "L5";     #was "DQUL0_0_P" 74\r
+# LOCATE COMP "DQUL0_1"                      SITE "M4";     #was "DQUL0_1_P" 78\r
+# LOCATE COMP "DQUL0_2"                      SITE "K6";     #was "DQUL0_2_P" 82\r
+# LOCATE COMP "DQSUL0"                       SITE "N9";     #was "DQSUL0_T"  86\r
+# LOCATE COMP "DQUL0_3"                      SITE "M2";     #was "DQUL0_3_P" 90\r
+# LOCATE COMP "DQUL0_4"                      SITE "M7";     #was "DQUL0_4_P" 94\r
+# \r
+# LOCATE COMP "DQUR1_0"                      SITE "N30";    #was "DQUR1_0_P" 106\r
+# LOCATE COMP "DQUR1_1"                      SITE "N26";    #was "DQUR1_1_P" 110\r
+# LOCATE COMP "DQUR1_2"                      SITE "N32";    #was "DQUR1_2_P" 114\r
+# LOCATE COMP "DQSUR1"                       SITE "N27";    #was "DQSUR1_T"  118\r
+# LOCATE COMP "DQUR1_3"                      SITE "N34";    #was "DQUR1_3_P" 122\r
+# LOCATE COMP "DQUR1_4"                      SITE "P28";    #was "DQUR1_4_P" 126\r
+# LOCATE COMP "DQUR2_0"                      SITE "T32";    #was "DQUR2_0_P" 130\r
+# LOCATE COMP "DQUR2_1"                      SITE "T26";    #was "DQUR2_1_P" 134\r
+# LOCATE COMP "DQUR2_2"                      SITE "U32";    #was "DQUR2_2_P" 138\r
+# LOCATE COMP "DQSUR2"                       SITE "T30";    #was "DQSUR2_T"  142\r
+# LOCATE COMP "DQUR2_3"                      SITE "T34";    #was "DQUR2_3_P" 146\r
+# LOCATE COMP "DQUR2_4"                      SITE "U26";    #was "DQUR2_4_P" 150\r
+# \r
+# LOCATE COMP "DQLR2_0"                      SITE "W30";    #was "DQLR2_0_P" 170\r
+# LOCATE COMP "DQLR2_1"                      SITE "W27";    #was "DQLR2_1_P" 174\r
+# LOCATE COMP "DQLR2_2"                      SITE "W34";    #was "DQLR2_2_P" 178\r
+# LOCATE COMP "DQSLR2"                       SITE "Y30";    #was "DQSLR2_T"  182\r
+# LOCATE COMP "DQLR2_3"                      SITE "Y34";    #was "DQLR2_3_P" 186\r
+# LOCATE COMP "DQLR2_4"                      SITE "Y26";    #was "DQLR2_4_P" 190\r
+# \r
+# DEFINE PORT GROUP "DQ_group" "DQ*" ;\r
+# IOBUF GROUP  "DQ_group" IO_TYPE=LVDS25 DIFFRESISTOR=100; \r
+\r
+\r
+\r
+#################################################################\r
+# ADC INPUTS\r
+#################################################################\r
+\r
+LOCATE COMP  "ADC1_CH_0"              SITE "AA2"; \r
+LOCATE COMP  "ADC1_CH_1"              SITE "AB2"; \r
+LOCATE COMP  "ADC1_CH_2"              SITE "AA4"; \r
+LOCATE COMP  "ADC_DCO_1"              SITE "AA10";\r
+LOCATE COMP  "ADC1_CH_3"              SITE "AA5"; \r
+LOCATE COMP  "ADC1_CH_4"              SITE "Y7";  \r
+\r
+LOCATE COMP  "ADC2_CH_0"              SITE "AE4"; \r
+LOCATE COMP  "ADC2_CH_1"              SITE "AB10";\r
+LOCATE COMP  "ADC2_CH_2"              SITE "AE2"; \r
+LOCATE COMP  "ADC_DCO_2"              SITE "AJ1"; \r
+LOCATE COMP  "ADC2_CH_3"              SITE "AD4"; \r
+LOCATE COMP  "ADC2_CH_4"              SITE "AC9"; \r
+\r
+LOCATE COMP  "ADC3_CH_0"              SITE "AC5";\r
+LOCATE COMP  "ADC3_CH_1"              SITE "AC2";\r
+LOCATE COMP  "ADC3_CH_2"              SITE "AB4";\r
+LOCATE COMP  "ADC_DCO_3"              SITE "AD5";\r
+LOCATE COMP  "ADC3_CH_3"              SITE "AA9";\r
+LOCATE COMP  "ADC3_CH_4"              SITE "AB7";\r
+\r
+LOCATE COMP  "ADC4_CH_0"              SITE "Y2";\r
+LOCATE COMP  "ADC4_CH_1"              SITE "W4";\r
+LOCATE COMP  "ADC4_CH_2"              SITE "W2";\r
+LOCATE COMP  "ADC_DCO_4"              SITE "W6";\r
+LOCATE COMP  "ADC4_CH_3"              SITE "W8";\r
+LOCATE COMP  "ADC4_CH_4"              SITE "Y8";\r
+\r
+LOCATE COMP  "ADC5_CH_0"              SITE "F2";\r
+LOCATE COMP  "ADC5_CH_1"              SITE "F3";\r
+LOCATE COMP  "ADC5_CH_2"              SITE "G2";\r
+LOCATE COMP  "ADC_DCO_5"              SITE "G3";\r
+LOCATE COMP  "ADC5_CH_3"              SITE "H1";\r
+LOCATE COMP  "ADC5_CH_4"              SITE "J3";\r
+\r
+LOCATE COMP  "ADC6_CH_0"              SITE "L5";\r
+LOCATE COMP  "ADC6_CH_1"              SITE "M4";\r
+LOCATE COMP  "ADC6_CH_2"              SITE "K6";\r
+LOCATE COMP  "ADC_DCO_6"              SITE "N9";\r
+LOCATE COMP  "ADC6_CH_3"              SITE "M2";\r
+LOCATE COMP  "ADC6_CH_4"              SITE "M7";\r
+\r
+LOCATE COMP  "ADC7_CH_0"              SITE "L26";\r
+LOCATE COMP  "ADC7_CH_1"              SITE "L32";\r
+LOCATE COMP  "ADC_DCO_7"              SITE "M26";\r
+LOCATE COMP  "ADC7_CH_2"              SITE "L34";\r
+LOCATE COMP  "ADC7_CH_3"              SITE "K29";\r
+LOCATE COMP  "ADC7_CH_4"              SITE "K34";\r
+\r
+LOCATE COMP  "ADC8_CH_0"              SITE "L2"; \r
+LOCATE COMP  "ADC8_CH_1"              SITE "K2"; \r
+LOCATE COMP  "ADC8_CH_2"              SITE "K4"; \r
+LOCATE COMP  "ADC_DCO_8"              SITE "L10";\r
+LOCATE COMP  "ADC8_CH_3"              SITE "M8"; \r
+LOCATE COMP  "ADC8_CH_4"              SITE "K7"; \r
+\r
+LOCATE COMP  "ADC9_CH_0"              SITE "AB34";\r
+LOCATE COMP  "ADC9_CH_1"              SITE "AA25";\r
+LOCATE COMP  "ADC9_CH_2"              SITE "AC34";\r
+LOCATE COMP  "ADC_DCO_9"              SITE "AB30";\r
+LOCATE COMP  "ADC9_CH_3"              SITE "AA31";\r
+LOCATE COMP  "ADC9_CH_4"              SITE "AA28";\r
+\r
+LOCATE COMP  "ADC10_CH_0"             SITE "N30";\r
+LOCATE COMP  "ADC10_CH_1"             SITE "N26";\r
+LOCATE COMP  "ADC10_CH_2"             SITE "N32";\r
+LOCATE COMP  "ADC_DCO_10"             SITE "N27";\r
+LOCATE COMP  "ADC10_CH_3"             SITE "N34";\r
+LOCATE COMP  "ADC10_CH_4"             SITE "P28";\r
+\r
+LOCATE COMP  "ADC11_CH_0"             SITE "T32";\r
+LOCATE COMP  "ADC11_CH_1"             SITE "T26";\r
+LOCATE COMP  "ADC11_CH_2"             SITE "U32";\r
+LOCATE COMP  "ADC_DCO_11"             SITE "T30";\r
+LOCATE COMP  "ADC11_CH_3"             SITE "T34";\r
+LOCATE COMP  "ADC11_CH_4"             SITE "U26";\r
+\r
+LOCATE COMP  "ADC12_CH_0"             SITE "AD31";\r
+LOCATE COMP  "ADC12_CH_1"             SITE "AB32";\r
+LOCATE COMP  "ADC12_CH_2"             SITE "AE34";\r
+LOCATE COMP  "ADC_DCO_12"             SITE "AB26";\r
+LOCATE COMP  "ADC12_CH_3"             SITE "AD33";\r
+LOCATE COMP  "ADC12_CH_4"             SITE "AF34";\r
+\r
+DEFINE PORT GROUP "ADC_group" "ADC*" ;\r
+IOBUF GROUP "ADC_group" IO_TYPE=LVDS25 DIFFRESISTOR=100;\r
+\r
+\r
+LOCATE COMP  "SPI_ADC_SCK"                 SITE "AA29";\r
+LOCATE COMP  "SPI_ADC_SDIO"                SITE "Y30";\r
+DEFINE PORT GROUP "SPI_ADC_group" "SPI_ADC*" ;\r
+IOBUF GROUP "SPI_ADC_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN DRIVE=8;\r
+\r
+\r
+LOCATE COMP  "LMK_CLK"                 SITE "M10";\r
+LOCATE COMP  "LMK_DATA"                SITE "W34";\r
+LOCATE COMP  "LMK_LE_1"                SITE "N10";\r
+LOCATE COMP  "LMK_LE_2"                SITE "P5";\r
+DEFINE PORT GROUP "LMK_group" "LMK*" ;\r
+IOBUF GROUP "LMK_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN DRIVE=8;\r
+\r
+LOCATE COMP  "POWER_ENABLE"            SITE "P4";\r
+IOBUF  PORT  "POWER_ENABLE" IO_TYPE=LVCMOS25 PULLMODE=DOWN DRIVE=8  ;\r
+\r
+LOCATE COMP  "P_CLOCK"                SITE "N2";\r
+IOBUF  PORT  "P_CLOCK" IO_TYPE=LVDS25  ;\r
+\r
+LOCATE COMP  "FPGA_CS_0"             SITE "Y26";\r
+LOCATE COMP  "FPGA_CS_1"             SITE "Y25";\r
+LOCATE COMP  "FPGA_SCK_0"            SITE "Y34"; \r
+LOCATE COMP  "FPGA_SCK_1"            SITE "Y33";\r
+LOCATE COMP  "FPGA_SDI_0"            SITE "N4";\r
+LOCATE COMP  "FPGA_SDI_1"            SITE "N3";\r
+LOCATE COMP  "FPGA_SDO_0"            SITE "W27";\r
+LOCATE COMP  "FPGA_SDO_1"            SITE "W26";\r
+DEFINE PORT GROUP "FPGA_group" "FPGA_*" ;\r
+IOBUF GROUP "FPGA_group" IO_TYPE=LVCMOS25 PULLMODE=UP;\r
+\r
+\r
+#################################################################\r
+# Pin-header IO\r
+#################################################################\r
+LOCATE COMP "HDR_IO_1"                     SITE "AP28";\r
+LOCATE COMP "HDR_IO_2"                     SITE "AN28";\r
+LOCATE COMP "HDR_IO_3"                     SITE "AP27";\r
+LOCATE COMP "HDR_IO_4"                     SITE "AN27";\r
+LOCATE COMP "HDR_IO_5"                     SITE "AM27";\r
+LOCATE COMP "HDR_IO_6"                     SITE "AL27";\r
+LOCATE COMP "HDR_IO_7"                     SITE "AH26";\r
+LOCATE COMP "HDR_IO_8"                     SITE "AG26";\r
+LOCATE COMP "HDR_IO_9"                     SITE "AM28";\r
+LOCATE COMP "HDR_IO_10"                    SITE "AL28";\r
+DEFINE PORT GROUP "HDR_group" "HDR*" ;\r
+IOBUF GROUP  "HDR_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN ;\r
+\r
+#################################################################\r
+# KEL Connector\r
+#################################################################\r
+# # LOCATE COMP "KEL1_N"                         SITE "AP6";\r
+# # LOCATE COMP "KEL2_N"                         SITE "AP3";\r
+# # LOCATE COMP "KEL3_N"                         SITE "AN2";\r
+# # LOCATE COMP "KEL4_N"                         SITE "AM3";\r
+# # LOCATE COMP "KEL5_N"                         SITE "AM5";\r
+# # LOCATE COMP "KEL6_N"                         SITE "AN6";\r
+# # LOCATE COMP "KEL7_N"                         SITE "AM4";\r
+# # LOCATE COMP "KEL8_N"                         SITE "AJ6";\r
+# # LOCATE COMP "KEL9_N"                         SITE "AJ3";\r
+# # LOCATE COMP "KEL10_N"                        SITE "AK3";\r
+# # LOCATE COMP "KEL11_N"                        SITE "AD8";\r
+# # LOCATE COMP "KEL12_N"                        SITE "AK4";\r
+# # LOCATE COMP "KEL13_N"                        SITE "V3";\r
+# # LOCATE COMP "KEL14_N"                        SITE "W5";\r
+# # LOCATE COMP "KEL15_N"                        SITE "T8";\r
+# # LOCATE COMP "KEL16_N"                        SITE "T1";\r
+# # LOCATE COMP "KEL17_N"                        SITE "P6";\r
+# # LOCATE COMP "KEL18_N"                        SITE "T7";\r
+# # LOCATE COMP "KEL19_N"                        SITE "R1";\r
+# # LOCATE COMP "KEL20_N"                        SITE "P10";\r
+# # LOCATE COMP "KEL21_N"                        SITE "AP30";\r
+# # LOCATE COMP "KEL22_N"                        SITE "AP32";\r
+# # LOCATE COMP "KEL23_N"                        SITE "AN33";\r
+# # LOCATE COMP "KEL24_N"                        SITE "AN31";\r
+# # LOCATE COMP "KEL25_N"                        SITE "AM32";\r
+# # LOCATE COMP "KEL26_N"                        SITE "AN29";\r
+# # LOCATE COMP "KEL27_N"                        SITE "AM31";\r
+# # LOCATE COMP "KEL28_N"                        SITE "AM30";\r
+# # LOCATE COMP "KEL29_N"                        SITE "AL33";\r
+# # LOCATE COMP "KEL30_N"                        SITE "AK31";\r
+# # LOCATE COMP "KEL31_N"                        SITE "AJ33";\r
+# # LOCATE COMP "KEL32_N"                        SITE "AK32";\r
+# # LOCATE COMP "KEL33_N"                        SITE "AF31";\r
+# # LOCATE COMP "KEL34_N"                        SITE "AE31";\r
+# # LOCATE COMP "KEL35_N"                        SITE "AE29";\r
+# # LOCATE COMP "KEL36_N"                        SITE "AD25";\r
+# # LOCATE COMP "KEL37_N"                        SITE "L30";\r
+# # LOCATE COMP "KEL38_N"                        SITE "AB27";\r
+# # LOCATE COMP "KEL39_N"                        SITE "M33";\r
+# # LOCATE COMP "KEL40_N"                        SITE "M28";\r
+# LOCATE COMP "KEL_1"                         SITE "AP5";\r
+# LOCATE COMP "KEL_2"                         SITE "AP2";\r
+# LOCATE COMP "KEL_3"                         SITE "AN1";\r
+# LOCATE COMP "KEL_4"                         SITE "AN3";\r
+# LOCATE COMP "KEL_5"                         SITE "AL5";\r
+# LOCATE COMP "KEL_6"                         SITE "AM6";\r
+# LOCATE COMP "KEL_7"                         SITE "AL4";\r
+# LOCATE COMP "KEL_8"                         SITE "AJ5";\r
+# LOCATE COMP "KEL_9"                         SITE "AJ2";\r
+# LOCATE COMP "KEL_10"                        SITE "AL3";\r
+# LOCATE COMP "KEL_11"                        SITE "AD9";\r
+# LOCATE COMP "KEL_12"                        SITE "AJ4";\r
+# LOCATE COMP "KEL_13"                        SITE "V4";\r
+# LOCATE COMP "KEL_14"                        SITE "V5";\r
+# LOCATE COMP "KEL_15"                        SITE "T9";\r
+# LOCATE COMP "KEL_16"                        SITE "T2";\r
+# LOCATE COMP "KEL_17"                        SITE "P7";\r
+# LOCATE COMP "KEL_18"                        SITE "R8";\r
+# LOCATE COMP "KEL_19"                        SITE "R2";\r
+# LOCATE COMP "KEL_20"                        SITE "P9";\r
+# LOCATE COMP "KEL_21"                        SITE "AP29";\r
+# LOCATE COMP "KEL_22"                        SITE "AP33";\r
+# LOCATE COMP "KEL_23"                        SITE "AN34";\r
+# LOCATE COMP "KEL_24"                        SITE "AP31";\r
+# LOCATE COMP "KEL_25"                        SITE "AN32";\r
+# LOCATE COMP "KEL_26"                        SITE "AM29";\r
+# LOCATE COMP "KEL_27"                        SITE "AL31";\r
+# LOCATE COMP "KEL_28"                        SITE "AL30";\r
+# LOCATE COMP "KEL_29"                        SITE "AL34";\r
+# LOCATE COMP "KEL_30"                        SITE "AJ31";\r
+# LOCATE COMP "KEL_31"                        SITE "AH33";\r
+# LOCATE COMP "KEL_32"                        SITE "AL32";\r
+# LOCATE COMP "KEL_33"                        SITE "AF32";\r
+# LOCATE COMP "KEL_34"                        SITE "AE32";\r
+# LOCATE COMP "KEL_35"                        SITE "AE30";\r
+# LOCATE COMP "KEL_36"                        SITE "AD26";\r
+# LOCATE COMP "KEL_37"                        SITE "M29";\r
+# LOCATE COMP "KEL_38"                        SITE "AC28";\r
+# LOCATE COMP "KEL_39"                        SITE "M34";\r
+# LOCATE COMP "KEL_40"                        SITE "L28";\r
+# DEFINE PORT GROUP "KEL_group" "KEL*" ;\r
+# IOBUF GROUP  "KEL_group" IO_TYPE=LVDS25 ;\r
+\r
+#################################################################\r
+# Many LED\r
+#################################################################\r
+LOCATE COMP "LED_RJ_GREEN_0"                 SITE "C25";\r
+LOCATE COMP "LED_RJ_RED_0"                   SITE "D25";\r
+LOCATE COMP "LED_GREEN"                      SITE "D24";\r
+LOCATE COMP "LED_ORANGE"                     SITE "E24";\r
+LOCATE COMP "LED_RED"                        SITE "K23";\r
+LOCATE COMP "LED_RJ_GREEN_1"                 SITE "G26";\r
+LOCATE COMP "LED_RJ_RED_1"                   SITE "G25";\r
+LOCATE COMP "LED_YELLOW"                     SITE "K24";\r
+IOBUF  PORT "LED_RJ_GREEN_0"    IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_RJ_RED_0"      IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_GREEN"         IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_ORANGE"        IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_RED"           IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_RJ_GREEN_1"    IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_RJ_RED_1"      IO_TYPE=LVCMOS25 ;\r
+IOBUF  PORT "LED_YELLOW"        IO_TYPE=LVCMOS25 ;\r
+\r
+LOCATE COMP "LED_SFP_GREEN_0"                SITE "B4";\r
+LOCATE COMP "LED_SFP_GREEN_1"                SITE "A6";\r
+LOCATE COMP "LED_SFP_RED_0"                  SITE "A3";\r
+LOCATE COMP "LED_SFP_RED_1"                  SITE "A8";\r
+DEFINE PORT GROUP "LED_SFP_group" "LED_SFP*" ;\r
+IOBUF GROUP  "LED_SFP_group" IO_TYPE=LVTTL33 ;\r
+\r
+LOCATE COMP "LED_WHITE_0"                    SITE "A32";\r
+LOCATE COMP "LED_WHITE_1"                    SITE "A33";\r
+DEFINE PORT GROUP "LED_WHITE_group" "LED_WHITE*" ;\r
+IOBUF GROUP  "LED_WHITE_group" IO_TYPE=LVTTL33 ;\r
+\r
+#################################################################\r
+# SFP Control Signals\r
+#################################################################\r
+LOCATE COMP "SFP_LOS_0"                      SITE "B6";\r
+LOCATE COMP "SFP_LOS_1"                      SITE "C9";\r
+LOCATE COMP "SFP_MOD0_0"                     SITE "A5";\r
+LOCATE COMP "SFP_MOD0_1"                     SITE "K11";\r
+LOCATE COMP "SFP_MOD1_0"                     SITE "B7";\r
+LOCATE COMP "SFP_MOD1_1"                     SITE "J11";\r
+LOCATE COMP "SFP_MOD2_0"                     SITE "A7";\r
+LOCATE COMP "SFP_MOD2_1"                     SITE "D9";\r
+# LOCATE COMP "SFP_RATE_SEL_0"                 SITE "A4";\r
+# LOCATE COMP "SFP_RATE_SEL_1"                 SITE "C8";\r
+LOCATE COMP "SFP_TX_DIS_0"                   SITE "D6";\r
+LOCATE COMP "SFP_TX_DIS_1"                   SITE "A9";\r
+# LOCATE COMP "SFP_TX_FAULT_0"                 SITE "C5";\r
+# LOCATE COMP "SFP_TX_FAULT_1"                 SITE "B8";\r
+DEFINE PORT GROUP "SFP_group" "SFP*" ;\r
+IOBUF GROUP  "SFP_group" IO_TYPE=LVTTL33 ;\r
+\r
+\r
+\r
+#################################################################\r
+# Serdes Output Switch\r
+#################################################################\r
+LOCATE COMP "PCSSW_ENSMB"                  SITE "B3";\r
+LOCATE COMP "PCSSW_EQ_0"                   SITE "B1";\r
+LOCATE COMP "PCSSW_EQ_1"                   SITE "B2";\r
+LOCATE COMP "PCSSW_EQ_2"                   SITE "E4";\r
+LOCATE COMP "PCSSW_EQ_3"                   SITE "D4";\r
+LOCATE COMP "PCSSW_PE_0"                   SITE "C3";\r
+LOCATE COMP "PCSSW_PE_1"                   SITE "C4";\r
+LOCATE COMP "PCSSW_PE_2"                   SITE "D3";\r
+LOCATE COMP "PCSSW_PE_3"                   SITE "C2";\r
+LOCATE COMP "PCSSW_1"                      SITE "D5";\r
+LOCATE COMP "PCSSW_0"                      SITE "A2";\r
+LOCATE COMP "PCSSW_2"                      SITE "E13";\r
+LOCATE COMP "PCSSW_3"                      SITE "F13";\r
+LOCATE COMP "PCSSW_4"                      SITE "G13";\r
+LOCATE COMP "PCSSW_5"                      SITE "H14";\r
+LOCATE COMP "PCSSW_6"                      SITE "A13";\r
+LOCATE COMP "PCSSW_7"                      SITE "B13";\r
+DEFINE PORT GROUP "PCSSW_group" "PCSSW*" ;\r
+IOBUF GROUP  "PCSSW_group" IO_TYPE=LVTTL33 PULLMODE=DOWN ;\r
+\r
+\r
+#################################################################\r
+# ADC\r
+#################################################################\r
+LOCATE COMP "ADC_CLK"                        SITE "A14";    \r
+LOCATE COMP "ADC_CS"                         SITE "B14";    \r
+LOCATE COMP "ADC_DIN"                        SITE "G17";    \r
+LOCATE COMP "ADC_DOUT"                       SITE "G16";    \r
+IOBUF  PORT "ADC_CLK"  IO_TYPE=LVTTL33 PULLMODE=UP DRIVE=4 ;\r
+IOBUF  PORT "ADC_CS"   IO_TYPE=LVTTL33 PULLMODE=UP DRIVE=4 ;\r
+IOBUF  PORT "ADC_DIN"  IO_TYPE=LVTTL33 PULLMODE=UP DRIVE=4 ;\r
+IOBUF  PORT "ADC_DOUT" IO_TYPE=LVTTL33 PULLMODE=UP ;\r
+\r
+\r
+\r
+#################################################################\r
+# RJ-45 connectors\r
+#################################################################\r
+LOCATE COMP "RJ_IO_0"                      SITE "R28";\r
+LOCATE COMP "RJ_IO_1"                      SITE "R31";\r
+LOCATE COMP "RJ_IO_2"                      SITE "R26";\r
+LOCATE COMP "RJ_IO_3"                      SITE "R34";\r
+#LOCATE COMP "RJ_IO_1_N"                      SITE "R27";\r
+#LOCATE COMP "RJ_IO_2_N"                      SITE "R30";\r
+#LOCATE COMP "RJ_IO_3_N"                      SITE "R25";\r
+#LOCATE COMP "RJ_IO_4_N"                      SITE "R33";\r
+IOBUF  PORT "RJ_IO_0" IO_TYPE=LVDS25 ;\r
+IOBUF  PORT "RJ_IO_1" IO_TYPE=LVDS25 ;\r
+IOBUF  PORT "RJ_IO_2" IO_TYPE=LVDS25E ;\r
+IOBUF  PORT "RJ_IO_3" IO_TYPE=LVDS25E ;\r
+\r
+\r
+LOCATE COMP "SPARE_IN_0"                    SITE "K31";\r
+LOCATE COMP "SPARE_IN_1"                    SITE "R4";\r
+#LOCATE COMP "SPARE_IN0_N"                    SITE "K32";\r
+#LOCATE COMP "SPARE_IN1_N"                    SITE "R3";\r
+IOBUF  PORT "SPARE_IN_1" IO_TYPE=LVDS25 DIFFRESISTOR=100 ;\r
+IOBUF  PORT "SPARE_IN_2" IO_TYPE=LVDS25 DIFFRESISTOR=100 ;\r
+\r
+\r
+\r
+#################################################################\r
+# Flash ROM and Reboot\r
+#################################################################\r
+LOCATE COMP "FLASH_CLK"                        SITE "F34";         #was "SPI_CLK"\r
+LOCATE COMP "FLASH_CS"                         SITE "D34";         #was "SPI_CS" \r
+LOCATE COMP "FLASH_IN"                         SITE "F33";         #was "SPI_IN" \r
+LOCATE COMP "FLASH_OUT"                        SITE "F32";         #was "SPI_OUT"\r
+LOCATE COMP "PROGRAMN"                         SITE "C31";\r
+\r
+DEFINE PORT GROUP "FLASH_group" "FLASH*" ;\r
+IOBUF GROUP "FLASH_group" IO_TYPE=LVTTL33 PULLMODE=NONE;\r
+IOBUF  PORT "PROGRAMN" IO_TYPE=LVTTL33 PULLMODE=UP DRIVE=8  ;\r
+\r
+LOCATE COMP "ENPIRION_CLOCK"                 SITE "H23";\r
+IOBUF  PORT "ENPIRION_CLOCK" IO_TYPE=LVCMOS25 PULLMODE=UP DRIVE=8  ;\r
+\r
+\r
+#################################################################\r
+# Misc\r
+#################################################################\r
+LOCATE COMP  "TEMPSENS"    SITE "J13";                             #was TEMP_OWB\r
+IOBUF  PORT "TEMPSENS" IO_TYPE=LVTTL33 PULLMODE=UP DRIVE=8  ;\r
+\r
+\r
+#################################################################\r
+# Trigger I/O\r
+#################################################################\r
+LOCATE COMP "TEST_LINE_0"                     SITE "A19";\r
+LOCATE COMP "TEST_LINE_1"                     SITE "B19";\r
+LOCATE COMP "TEST_LINE_2"                     SITE "K20";\r
+LOCATE COMP "TEST_LINE_3"                     SITE "L19";\r
+LOCATE COMP "TEST_LINE_4"                     SITE "C19";\r
+LOCATE COMP "TEST_LINE_5"                     SITE "D19";\r
+LOCATE COMP "TEST_LINE_6"                     SITE "J19";\r
+LOCATE COMP "TEST_LINE_7"                     SITE "K19";\r
+LOCATE COMP "TEST_LINE_8"                     SITE "A20";\r
+LOCATE COMP "TEST_LINE_9"                     SITE "B20";\r
+LOCATE COMP "TEST_LINE_10"                    SITE "G20";\r
+LOCATE COMP "TEST_LINE_11"                    SITE "G21";\r
+LOCATE COMP "TEST_LINE_12"                    SITE "C20";\r
+LOCATE COMP "TEST_LINE_13"                    SITE "D20";\r
+LOCATE COMP "TEST_LINE_14"                    SITE "F21";\r
+LOCATE COMP "TEST_LINE_15"                    SITE "F22";\r
+DEFINE PORT GROUP "TEST_LINE_group" "TEST_LINE*" ;\r
+IOBUF GROUP "TEST_LINE_group" IO_TYPE=LVCMOS25 PULLMODE=DOWN DRIVE=8;\r

diff --git a/tdctemplate/config.vhd b/tdctemplate/config.vhd
index b9df6845c6329380489a8261b31f76b9bd77b281..0cea7b61733c1a207e797c11b61cd0f038f54105 100644 (file)
--- a/tdctemplate/config.vhd
+++ b/tdctemplate/config.vhd
@@ -12,8 +12,8 @@ package config is
 
 --TDC settings
   constant NUM_TDC_MODULES         : integer range 1 to 4  := 1;  -- number of tdc modules to implement
-  constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 41;  -- number of tdc channels per module
-  constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 6;  --the nearest power of two, for convenience reasons 
+  constant NUM_TDC_CHANNELS        : integer range 1 to 65 := 33;  -- number of tdc channels per module
+  constant NUM_TDC_CHANNELS_POWER2 : integer range 0 to 6  := 5;  --the nearest power of two, for convenience reasons 
   constant DOUBLE_EDGE_TYPE        : integer range 0 to 3  := 1;  --double edge type:  0, 1, 2,  3
   -- 0: single edge only,
   -- 1: same channel,
@@ -42,16 +42,16 @@ package config is
     constant SERDES_NUM             : integer := 3;
     
     constant INCLUDE_UART           : integer  := c_NO;
-    constant INCLUDE_SPI            : integer  := c_NO;
+    constant INCLUDE_SPI            : integer  := c_YES;
     constant INCLUDE_LCD            : integer  := c_NO;
     constant INCLUDE_DEBUG_INTERFACE: integer  := c_YES;    
    
     --input monitor and trigger generation logic
     constant INCLUDE_TRIGGER_LOGIC  : integer  := c_YES;
     constant INCLUDE_STATISTICS     : integer  := c_YES;
-    constant TRIG_GEN_INPUT_NUM     : integer  := 40;
+    constant TRIG_GEN_INPUT_NUM     : integer  := 32;
     constant TRIG_GEN_OUTPUT_NUM    : integer  := 4;
-    constant MONITOR_INPUT_NUM      : integer  := 44;    
+    constant MONITOR_INPUT_NUM      : integer  := 36;    
    
 ------------------------------------------------------------------------------
 --End of design configuration

diff --git a/tdctemplate/config_compile_frankfurt.pl b/tdctemplate/config_compile_frankfurt.pl
index 993c40cb005f13a075ef1162a51c16a96bed2438..dd75c0a26935788d7eaf3d82a7ec3951b4e0cafb 100644 (file)
--- a/tdctemplate/config_compile_frankfurt.pl
+++ b/tdctemplate/config_compile_frankfurt.pl
@@ -1,16 +1,12 @@
 TOPNAME                      => "trb3sc_tdctemplate",
-lm_license_file_for_synplify => "1702\@hadeb05.gsi.de", #"27000\@lxcad01.gsi.de";
+lm_license_file_for_synplify => "27020\@jspc29", #"27000\@lxcad01.gsi.de";
 lm_license_file_for_par      => "1702\@hadeb05.gsi.de",
-lattice_path                 => '/d/jspc29/lattice/diamond/3.6_x64',
-synplify_path                => '/d/jspc29/lattice/synplify/K-2015.09/',
-synplify_command             => "/d/jspc29/lattice/diamond/3.6_x64/bin/lin64/synpwrap -fg -options",
-#synplify_command             => "/d/jspc29/lattice/synplify/J-2014.09-SP2/bin/synplify_premier_dp",
-#synplify_command             => "ssh -p 59222 jmichel\@cerberus \"cd /home/jmichel/git/trb3sc/tdctemplate/workdir; LM_LICENSE_FILE=27000\@lxcad01.gsi.de /opt/synplicity/K-2015.09/bin/synplify_premier_dp -batch ../trb3sc_tdctemplate.prj\" #",
-
+lattice_path                 => '/d/jspc29/lattice/diamond/3.9_x64',
+synplify_path                => '/d/jspc29/lattice/synplify/M-2017.03/',
 nodelist_file                => 'nodes_frankfurt.txt',
-
+# synplify_command             => "ssh -p 52238 jmichel\@cerberus \"cd /home/jmichel/git/trb3sc/tdctemplate/workdir; LM_LICENSE_FILE=27000\@lxcad01.gsi.de /opt/synplicity/L-2016.09-1/bin/synplify_premier_dp -batch ../trb3sc_tdctemplate.prj\" #",
 #Include only necessary lpf files
-#pinout_file                  => '', #name of pin-out file, if not equal TOPNAME
+pinout_file                  => 'trb3sc_32pin', #name of pin-out file, if not equal TOPNAME
 include_TDC                  => 1,
 include_GBE                  => 0,
 

diff --git a/tdctemplate/par.p2t b/tdctemplate/par.p2t
index c203493ba6d40405a70dfde9b4b00b65708bf991..1eb1972b853a751831c0f376910949fa019c3992 100644 (file)
--- a/tdctemplate/par.p2t
+++ b/tdctemplate/par.p2t
@@ -14,8 +14,8 @@
 -l 5
 -i 6
 -n 1
--t 1
+-t 4
 -s 1
 -c 0
 -e 0
--exp parUseNBR=1:parCDP=auto:parCDR=1:parPathBased=OFF:parHold=0
+-exp parUseNBR=1:parCDP=auto:parCDR=1:parPathBased=OFF:parHold=ON:parHoldLimit=10000

diff --git a/tdctemplate/trb3sc_tdctemplate.vhd b/tdctemplate/trb3sc_tdctemplate.vhd
index 577390a01231c075e2e29d8373bb6412dd8d94dc..f9d643e98b104f7cd597a3d714f5997968838972 100644 (file)
--- a/tdctemplate/trb3sc_tdctemplate.vhd
+++ b/tdctemplate/trb3sc_tdctemplate.vhd
@@ -37,8 +37,13 @@ entity trb3sc_tdctemplate is
     --Backplane for slaves on trbv3scbp1
 --     BACK_GPIO            : inout std_logic_vector(3 downto 0);
 
-    --AddOn Connector
-    --to be added
+    --AddOn Connector - 32 Pin AddOn
+    INP : in std_logic_vector(31 downto 0);
+    DAC_IN_SDI   : in  std_logic;
+    DAC_OUT_SCK  : out std_logic;
+    DAC_OUT_CS   : out std_logic;
+    DAC_OUT_SDO  : out std_logic;
+    RES          : out std_logic;
 
     --KEL Connector
     KEL : in std_logic_vector(40 downto 1);
@@ -355,9 +360,12 @@ begin
       ADC_MISO      => ADC_DOUT,
       ADC_CLK       => ADC_CLK,
       --Trigger & Monitor 
-      MONITOR_INPUTS(39 downto 0) => KEL(40 downto 1),
-      MONITOR_INPUTS(43 downto 40) => trig_gen_out_i,
-      TRIG_GEN_INPUTS  => KEL(40 downto 1),
+--       MONITOR_INPUTS(39 downto 0) => KEL(40 downto 1),
+--       MONITOR_INPUTS(43 downto 40) => trig_gen_out_i,
+--       TRIG_GEN_INPUTS  => KEL(40 downto 1),
+      MONITOR_INPUTS(31 downto 0) => INP(31 downto 0),
+      MONITOR_INPUTS(35 downto 32) => trig_gen_out_i,
+      TRIG_GEN_INPUTS  => INP(31 downto 0),
       TRIG_GEN_OUTPUTS => trig_gen_out_i,
       --SED
       SED_ERROR_OUT => sed_error_i,
@@ -395,6 +403,10 @@ begin
   BACK_LVDS <= (others => '0');
   BACK_3V3  <= (others => 'Z');
 
+  spi_miso(0) <= DAC_IN_SDI;
+  DAC_OUT_SCK <= spi_clk(0);
+  DAC_OUT_CS  <= spi_cs(0);
+  DAC_OUT_SDO <= spi_mosi(0);
 
 ---------------------------------------------------------------------------
 -- LCD Data to display
@@ -466,18 +478,29 @@ TEST_LINE <=   med_stat_debug(15 downto 0);
 
   -- For single edge measurements
   gen_single : if DOUBLE_EDGE_TYPE = 0 or DOUBLE_EDGE_TYPE = 1 or DOUBLE_EDGE_TYPE = 3 generate
-    hit_in_i(40 downto 1) <= KEL(40 downto 1);
+    hit_in_i(32 downto 1) <= INP(31 downto 0);
   end generate;
 
   -- For ToT Measurements
   gen_double : if DOUBLE_EDGE_TYPE = 2 generate
-    Gen_Hit_In_Signals : for i in 1 to 20 generate
-      hit_in_i(i*2-1) <= KEL(i);
-      hit_in_i(i*2)   <= not KEL(i);
+    Gen_Hit_In_Signals : for i in 0 to 31 generate
+      hit_in_i(i*2+1)   <= INP(i);
+      hit_in_i(i*2+2)   <= not INP(i);
     end generate Gen_Hit_In_Signals;
   end generate;
 
-
+--   -- For single edge measurements
+--   gen_single : if DOUBLE_EDGE_TYPE = 0 or DOUBLE_EDGE_TYPE = 1 or DOUBLE_EDGE_TYPE = 3 generate
+--     hit_in_i(40 downto 1) <= KEL(40 downto 1);
+--   end generate;
+-- 
+--   -- For ToT Measurements
+--   gen_double : if DOUBLE_EDGE_TYPE = 2 generate
+--     Gen_Hit_In_Signals : for i in 1 to 20 generate
+--       hit_in_i(i*2-1) <= KEL(i);
+--       hit_in_i(i*2)   <= not KEL(i);
+--     end generate Gen_Hit_In_Signals;
+--   end generate;
   
 end architecture;