From 2f6d3c8df6d0776c4980cd536e98d8aadb424f8f Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Wed, 28 Mar 2018 16:21:02 +0200 Subject: [PATCH] fix order of interfaces and I/O standards on combiner --- combiner/combiner.lpf | 8 ++++---- combiner/combiner.vhd | 20 ++++++++++---------- combiner/par.p2t | 2 +- pinout/combiner.lpf | 12 ++++++------ 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/combiner/combiner.lpf b/combiner/combiner.lpf index 992e5e0..921a7a0 100644 --- 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 a1847f0..13c75a5 100644 --- 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 7f2e7bf..c251db6 100644 --- 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 e2908a2..332b5bd 100644 --- 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"; -- 2.43.0