fix order of interfaces and I/O standards on combiner

diff --git a/combiner/combiner.lpf b/combiner/combiner.lpf
index 992e5e07dd73da4f4a9d80d26bea828fa00e2362..921a7a0a66ef733c2d04723149d03dd51a811d39 100644 (file)
--- a/combiner/combiner.lpf
+++ b/combiner/combiner.lpf
@@ -19,10 +19,10 @@ LOCATE COMP          "THE_MEDIA_4_DOWN_A/THE_SERDES/PCSD_INST"  SITE "PCSA" ;
 LOCATE COMP          "THE_MEDIA_4_DOWN_B/THE_SERDES/PCSD_INST" SITE "PCSB" ;
 LOCATE COMP          "THE_MEDIA_4_DOWN_D/THE_SERDES/PCSD_INST" SITE "PCSD" ;
 
-REGION               "MEDIA_A" "R93C91D" 22 36;
-REGION               "MEDIA_B" "R93C55D" 22 36;
-REGION               "MEDIA_C" "R93C127D" 22 36;
-REGION               "MEDIA_D" "R93C19D" 22 36;
+REGION               "MEDIA_A" "R87C91D" 28 36;
+REGION               "MEDIA_B" "R87C55D" 28 36;
+REGION               "MEDIA_C" "R87C127D" 28 36;
+REGION               "MEDIA_D" "R87C19D" 28 36;
 
 
 #REGION               "MEDIA_DOWN1" "R93C10D" 22 160;

diff --git a/combiner/combiner.vhd b/combiner/combiner.vhd
index a1847f0d308f923a5445bdeab6735646cf458fe0..13c75a54ea94acfff230f0fbba1ba0f7552886cd 100644 (file)
--- a/combiner/combiner.vhd
+++ b/combiner/combiner.vhd
@@ -285,12 +285,12 @@ THE_MEDIA_4_DOWN_B : entity work.med_ecp3_sfp_sync_4
     --Internal Connection
     MEDIA_MED2INT(0)   => med2int(9),
     MEDIA_MED2INT(1)   => med2int(10),
-    MEDIA_MED2INT(2)   => med2int(3),
-    MEDIA_MED2INT(3)   => med2int(4),
+    MEDIA_MED2INT(2)   => med2int(4),
+    MEDIA_MED2INT(3)   => med2int(3),
     MEDIA_INT2MED(0)   => int2med(9),
     MEDIA_INT2MED(1)   => int2med(10),
-    MEDIA_INT2MED(2)   => int2med(3),
-    MEDIA_INT2MED(3)   => int2med(4),
+    MEDIA_INT2MED(2)   => int2med(4),
+    MEDIA_INT2MED(3)   => int2med(3),
 
     --Sync operation
     RX_DLM             => open,
@@ -301,16 +301,16 @@ THE_MEDIA_4_DOWN_B : entity work.med_ecp3_sfp_sync_4
     --SFP Connection
     SD_PRSNT_N_IN(0)  => back_slave_ready_i(9),
     SD_PRSNT_N_IN(1)  => back_slave_ready_i(10),
-    SD_PRSNT_N_IN(2)  => back_slave_ready_i(3),
-    SD_PRSNT_N_IN(3)  => back_slave_ready_i(4),
+    SD_PRSNT_N_IN(2)  => back_slave_ready_i(4),
+    SD_PRSNT_N_IN(3)  => back_slave_ready_i(3),
     SD_LOS_IN(0)      => back_slave_ready_i(9),
     SD_LOS_IN(1)      => back_slave_ready_i(10),
-    SD_LOS_IN(2)      => back_slave_ready_i(3),
-    SD_LOS_IN(3)      => back_slave_ready_i(4),
+    SD_LOS_IN(2)      => back_slave_ready_i(4),
+    SD_LOS_IN(3)      => back_slave_ready_i(3),
     SD_TXDIS_OUT(0)   => back_master_ready_i(9),
     SD_TXDIS_OUT(1)   => back_master_ready_i(10),
-    SD_TXDIS_OUT(2)   => back_master_ready_i(3),
-    SD_TXDIS_OUT(3)   => back_master_ready_i(4),
+    SD_TXDIS_OUT(2)   => back_master_ready_i(4),
+    SD_TXDIS_OUT(3)   => back_master_ready_i(3),
     
     --Control Interface
     BUS_RX             => bussci_rx(1),

diff --git a/combiner/par.p2t b/combiner/par.p2t
index 7f2e7bfd981bb6a9c25ae97876b396e82433f4cb..c251db6369b801a5e39c11e52ab40cb1a6f1e9f9 100644 (file)
--- a/combiner/par.p2t
+++ b/combiner/par.p2t
@@ -4,7 +4,7 @@
 -n 1
 -y
 -s 12
--t 33
+-t 42
 -c 1
 -e 2
 #-g guidefile.ncd

diff --git a/pinout/combiner.lpf b/pinout/combiner.lpf
index e2908a2ec08d8bd07ad8487309f8c5a1b46ec9f1..332b5bdc09bb77ca4b4dfd16983c19ce09a786ba 100644 (file)
--- a/pinout/combiner.lpf
+++ b/pinout/combiner.lpf
@@ -85,12 +85,12 @@ LOCATE COMP "RJ45_SIG_2"                    SITE "J3";
 LOCATE COMP "RJ45_SIG_3"                    SITE "G2";
 LOCATE COMP "RJ45_SIG_4"                    SITE "K6";
 LOCATE COMP "RJ45_SIG_5"                    SITE "K7";
-DEFINE PORT GROUP "RJ45_SIG_group" "RJ45_SIG*" ;
-IOBUF GROUP  "RJ45_SIG_1" IO_TYPE=LVDS25  DIFFRESISTOR=100 ;
-IOBUF GROUP  "RJ45_SIG_2" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
-IOBUF GROUP  "RJ45_SIG_3" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
-IOBUF GROUP  "RJ45_SIG_4" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
-IOBUF GROUP  "RJ45_SIG_5" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
+#DEFINE PORT GROUP "RJ45_SIG_group" "RJ45_SIG*" ;
+IOBUF PORT "RJ45_SIG_1" IO_TYPE=LVDS25  DIFFRESISTOR=100 ;
+IOBUF PORT "RJ45_SIG_2" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
+IOBUF PORT "RJ45_SIG_3" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
+IOBUF PORT "RJ45_SIG_4" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
+IOBUF PORT "RJ45_SIG_5" IO_TYPE=LVDS25  ;#DIFFRESISTOR=100 ;
 
 
 LOCATE COMP "SFP_LOS"                        SITE "B4";