use internal clock

diff --git a/ethernet/ethernet.ucf b/ethernet/ethernet.ucf
index b0b7d5268da2d5073ddff7945fa58b8227f4f31f..3353112787f38e7de66687b4ba1ae16bd0c692d9 100644 (file)
--- a/ethernet/ethernet.ucf
+++ b/ethernet/ethernet.ucf
@@ -30,7 +30,7 @@
 # NET "PCI_AD<7>"  LOC = "E7" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_AD<8>"  LOC = "B8" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_AD<9>"  LOC = "F10" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_AD<7>"  LOC = "E7" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_AD<8>"  LOC = "B8" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_AD<9>"  LOC = "F10" | IOSTANDARD = PCI33_3 ;

-NET "PCI_CLOCK"  LOC = "A11" | IOSTANDARD = PCI33_3 ;
+#NET "PCI_CLOCK"  LOC = "A11" | IOSTANDARD = PCI33_3 ;

 # NET "PCI_IDSEL"  LOC = "D14" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_CBEn<0>"  LOC = "F9" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_CBEn<1>"  LOC = "C10" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_IDSEL"  LOC = "D14" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_CBEn<0>"  LOC = "F9" | IOSTANDARD = PCI33_3 ;
 # NET "PCI_CBEn<1>"  LOC = "C10" | IOSTANDARD = PCI33_3 ;


@@ -59,6 +59,7 @@ NET "PCI_CLOCK"  LOC = "A11" | IOSTANDARD = PCI33_3 ;
 # NET "TB_nDEVSEL"  LOC = "M5" | IOSTANDARD = LVCMOS33 ;
 # NET "TB_nINTA"  LOC = "U2" | IOSTANDARD = LVCMOS33 ;
 
 # NET "TB_nDEVSEL"  LOC = "M5" | IOSTANDARD = LVCMOS33 ;
 # NET "TB_nINTA"  LOC = "U2" | IOSTANDARD = LVCMOS33 ;
 

+NET "INT_CLOCK"  LOC = "AA11" | IOSTANDARD = PCI33_3 ;

 NET "MTX_CLK_PAD_I"  LOC = "M2" | IOSTANDARD = LVCMOS33;
 
 NET "MTXD_PAD_O<0>"  LOC = "M5" | IOSTANDARD = LVCMOS33;
 NET "MTX_CLK_PAD_I"  LOC = "M2" | IOSTANDARD = LVCMOS33;
 
 NET "MTXD_PAD_O<0>"  LOC = "M5" | IOSTANDARD = LVCMOS33;

diff --git a/heartbeat/raggedstone.ucf b/heartbeat/raggedstone.ucf
index 2dd2b3fdfd71e25f323210400882d091899b8ce2..4cfac3d78e9fcfbc563ea2a2d470592cbaa6a25d 100644 (file)
--- a/heartbeat/raggedstone.ucf
+++ b/heartbeat/raggedstone.ucf
@@ -36,7 +36,8 @@ NET "PCI_CBE<0>"  LOC = "F9" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<1>"  LOC = "C10" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<2>"  LOC = "D13" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<3>"  LOC = "E13" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<1>"  LOC = "C10" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<2>"  LOC = "D13" | IOSTANDARD = PCI33_3 ;
 NET "PCI_CBE<3>"  LOC = "E13" | IOSTANDARD = PCI33_3 ;

-NET "PCI_CLK"  LOC = "A11" | IOSTANDARD = PCI33_3 ;
+#NET "PCI_CLK"  LOC = "A11" | IOSTANDARD = PCI33_3 ;
+NET "PCI_CLK"  LOC = "AA11" | IOSTANDARD = PCI33_3 ;

 NET "PCI_IDSEL"  LOC = "D14" | IOSTANDARD = PCI33_3 ;
 NET "PCI_nDEVSEL"  LOC = "E12" | IOSTANDARD = PCI33_3 ;
 NET "PCI_nFRAME"  LOC = "C13" | IOSTANDARD = PCI33_3 ;
 NET "PCI_IDSEL"  LOC = "D14" | IOSTANDARD = PCI33_3 ;
 NET "PCI_nDEVSEL"  LOC = "E12" | IOSTANDARD = PCI33_3 ;
 NET "PCI_nFRAME"  LOC = "C13" | IOSTANDARD = PCI33_3 ;


@@ -51,7 +52,7 @@ NET "PCI_PAR"  LOC = "A9" | IOSTANDARD = PCI33_3  | SLEW = FAST ;
 NET "PCI_nREQ"  LOC = "C18" | IOSTANDARD = PCI33_3 | SLEW = FAST ;
 NET "LED5"  LOC = "AB4" | IOSTANDARD = LVCMOS33 ;
 NET "LED4"  LOC = "AA4" | IOSTANDARD = LVCMOS33 ;
 NET "PCI_nREQ"  LOC = "C18" | IOSTANDARD = PCI33_3 | SLEW = FAST ;
 NET "LED5"  LOC = "AB4" | IOSTANDARD = LVCMOS33 ;
 NET "LED4"  LOC = "AA4" | IOSTANDARD = LVCMOS33 ;

-NET "IDE1"  LOC = "Y1" | IOSTANDARD = LVCMOS33 ;
-NET "IDE2"  LOC = "M6" | IOSTANDARD = LVCMOS33 ;
-NET "IDE3"  LOC = "M5" | IOSTANDARD = LVCMOS33 ;
-NET "IDE4"  LOC = "U2" | IOSTANDARD = LVCMOS33 ;
+#NET "IDE1"  LOC = "Y1" | IOSTANDARD = LVCMOS33 ;
+#NET "IDE2"  LOC = "M6" | IOSTANDARD = LVCMOS33 ;
+#NET "IDE3"  LOC = "M5" | IOSTANDARD = LVCMOS33 ;
+#NET "IDE4"  LOC = "U2" | IOSTANDARD = LVCMOS33 ;

diff --git a/heartbeat/source/heartbeat.vhd b/heartbeat/source/heartbeat.vhd
index cae72cd9a4e4f6042fa4cac8a6a5647e8f26e0cc..a3961603e20e9a03a9e19a92681c8a9aa37cdb03 100644 (file)
--- a/heartbeat/source/heartbeat.vhd
+++ b/heartbeat/source/heartbeat.vhd
@@ -46,7 +46,7 @@ if (rising_edge(clk_i)) then
                led9_o <= state(7);
                counter := counter + 1;
                if counter = divider then
                led9_o <= state(7);
                counter := counter + 1;
                if counter = divider then

-                       if state(7) = '1' then
+                       if state(3) = '1' then

                                direction := '1';
                        end if;
 
                                direction := '1';
                        end if;
 

diff --git a/heartbeat/source/top_raggedstone.vhd b/heartbeat/source/top_raggedstone.vhd
index 3d369cf5dae28104afb9dd4d3cf51a7dc1c2cd01..01dc26bde0fa09934f30768c7fa92d81b809dbfb 100644 (file)
--- a/heartbeat/source/top_raggedstone.vhd
+++ b/heartbeat/source/top_raggedstone.vhd
@@ -64,11 +64,11 @@ port (
        LED3    : out std_logic;\r
        LED2    : out std_logic;\r
        LED4            : out std_logic;\r
        LED3    : out std_logic;\r
        LED2    : out std_logic;\r
        LED4            : out std_logic;\r

-       LED5            : out std_logic;\r
-       IDE1    : out std_logic;\r
-       IDE2    : out std_logic;\r
-       IDE3    : out std_logic;\r
-       IDE4    : out std_logic\r
+       LED5            : out std_logic\r
+--     IDE1    : out std_logic;\r
+--     IDE2    : out std_logic;\r
+--     IDE3    : out std_logic;\r
+--     IDE4    : out std_logic\r

 \r
 );\r
 end raggedstone;\r
 \r
 );\r
 end raggedstone;\r


@@ -209,11 +209,11 @@ port map(
        led2_o => LED2,\r
        led3_o => LED3,\r
        led4_o => LED4,\r
        led2_o => LED2,\r
        led3_o => LED3,\r
        led4_o => LED4,\r

-       led5_o => LED5,\r
-       led6_o => IDE1,\r
-       led7_o => IDE2,\r
-       led8_o => IDE3,\r
-       led9_o => IDE4\r
+       led5_o => LED5\r
+--     led6_o => IDE1,\r
+--     led7_o => IDE2,\r
+--     led8_o => IDE3,\r
+--     led9_o => IDE4\r

 );\r
 \r
 end raggedstone_arch;\r
 );\r
 \r
 end raggedstone_arch;\r