From: michael Date: Wed, 21 Mar 2007 21:32:59 +0000 (+0000) Subject: watch inta X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/raggedstone/commitdiff_plain/de64fba0107b84e71ed24fe891a1e0582ac773c9?ds=sidebyside watch inta --- diff --git a/ethernet/ethernet.cpj b/ethernet/ethernet.cpj index da54ba9..7b2acd7 100644 --- a/ethernet/ethernet.cpj +++ b/ethernet/ethernet.cpj @@ -1,5 +1,5 @@ #ChipScope Pro Analyzer Project File, Version 3.0 -#Wed Mar 21 21:48:13 GMT+01:00 2007 +#Wed Mar 21 22:17:28 GMT+01:00 2007 deviceChain.deviceName0=XCF02S deviceChain.deviceName1=XCF04S deviceChain.deviceName2=XC3S1500 @@ -10,8 +10,8 @@ deviceChain.name0=MyDevice0 deviceChain.name1=MyDevice1 deviceChain.name2=MyDevice2 deviceIds=050450930504609301434093 -mdiAreaHeight=0.8145065398335315 -mdiAreaHeightLast=0.8145065398335315 +mdiAreaHeight=0.8139255702280912 +mdiAreaHeightLast=0.8223289315726291 mdiCount=2 mdiDevice0=2 mdiDevice1=2 @@ -19,23 +19,23 @@ mdiType0=1 mdiType1=0 mdiUnit0=0 mdiUnit1=0 -navigatorHeight=0.18311533888228299 -navigatorHeightLast=0.18311533888228299 -navigatorWidth=0.18256410256410258 -navigatorWidthLast=0.18256410256410258 +navigatorHeight=0.18487394957983194 +navigatorHeightLast=0.18487394957983194 +navigatorWidth=0.1844559585492228 +navigatorWidthLast=0.1844559585492228 unit.-1.-1.username= -unit.2.0.0.HEIGHT0=0.3020528 +unit.2.0.0.HEIGHT0=0.3051852 unit.2.0.0.TriggerRow0=1 unit.2.0.0.TriggerRow1=1 unit.2.0.0.TriggerRow2=1 unit.2.0.0.WIDTH0=1.0 unit.2.0.0.X0=0.0 unit.2.0.0.Y0=0.0 -unit.2.0.1.HEIGHT1=0.6568915 +unit.2.0.1.HEIGHT1=0.6562963 unit.2.0.1.WIDTH1=1.0 unit.2.0.1.X1=0.0 -unit.2.0.1.Y1=0.29618767 -unit.2.0.MFBitsA0=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +unit.2.0.1.Y1=0.2962963 +unit.2.0.MFBitsA0=X1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX unit.2.0.MFBitsB0=00000000000000000000000000000000 unit.2.0.MFCompareA0=0 unit.2.0.MFCompareB0=999 @@ -594,7 +594,7 @@ unit.2.0.triggerWindowCount=1 unit.2.0.triggerWindowDepth=2048 unit.2.0.triggerWindowTS=0 unit.2.0.username=MyILA0 -unit.2.0.waveform.count=34 +unit.2.0.waveform.count=26 unit.2.0.waveform.posn.0.channel=2147483646 unit.2.0.waveform.posn.0.name=DataPort_1 unit.2.0.waveform.posn.0.radix=1 @@ -603,80 +603,80 @@ unit.2.0.waveform.posn.1.channel=2147483646 unit.2.0.waveform.posn.1.name=DataPort unit.2.0.waveform.posn.1.radix=1 unit.2.0.waveform.posn.1.type=bus -unit.2.0.waveform.posn.10.channel=40 -unit.2.0.waveform.posn.10.name=DataPort[40] +unit.2.0.waveform.posn.10.channel=48 +unit.2.0.waveform.posn.10.name=DataPort[48] unit.2.0.waveform.posn.10.type=signal -unit.2.0.waveform.posn.11.channel=41 -unit.2.0.waveform.posn.11.name=DataPort[41] +unit.2.0.waveform.posn.11.channel=49 +unit.2.0.waveform.posn.11.name=DataPort[49] unit.2.0.waveform.posn.11.type=signal -unit.2.0.waveform.posn.12.channel=42 -unit.2.0.waveform.posn.12.name=DataPort[42] +unit.2.0.waveform.posn.12.channel=50 +unit.2.0.waveform.posn.12.name=DataPort[50] unit.2.0.waveform.posn.12.type=signal -unit.2.0.waveform.posn.13.channel=43 -unit.2.0.waveform.posn.13.name=DataPort[43] +unit.2.0.waveform.posn.13.channel=51 +unit.2.0.waveform.posn.13.name=DataPort[51] unit.2.0.waveform.posn.13.type=signal -unit.2.0.waveform.posn.14.channel=44 -unit.2.0.waveform.posn.14.name=DataPort[44] +unit.2.0.waveform.posn.14.channel=52 +unit.2.0.waveform.posn.14.name=DataPort[52] unit.2.0.waveform.posn.14.type=signal -unit.2.0.waveform.posn.15.channel=45 -unit.2.0.waveform.posn.15.name=DataPort[45] +unit.2.0.waveform.posn.15.channel=53 +unit.2.0.waveform.posn.15.name=DataPort[53] unit.2.0.waveform.posn.15.type=signal -unit.2.0.waveform.posn.16.channel=46 -unit.2.0.waveform.posn.16.name=DataPort[46] +unit.2.0.waveform.posn.16.channel=54 +unit.2.0.waveform.posn.16.name=DataPort[54] unit.2.0.waveform.posn.16.type=signal -unit.2.0.waveform.posn.17.channel=47 -unit.2.0.waveform.posn.17.name=DataPort[47] +unit.2.0.waveform.posn.17.channel=55 +unit.2.0.waveform.posn.17.name=DataPort[55] unit.2.0.waveform.posn.17.type=signal -unit.2.0.waveform.posn.18.channel=48 -unit.2.0.waveform.posn.18.name=DataPort[48] +unit.2.0.waveform.posn.18.channel=56 +unit.2.0.waveform.posn.18.name=DataPort[56] unit.2.0.waveform.posn.18.type=signal -unit.2.0.waveform.posn.19.channel=49 -unit.2.0.waveform.posn.19.name=DataPort[49] +unit.2.0.waveform.posn.19.channel=57 +unit.2.0.waveform.posn.19.name=DataPort[57] unit.2.0.waveform.posn.19.type=signal -unit.2.0.waveform.posn.2.channel=32 -unit.2.0.waveform.posn.2.name=DataPort[32] +unit.2.0.waveform.posn.2.channel=40 +unit.2.0.waveform.posn.2.name=DataPort[40] unit.2.0.waveform.posn.2.type=signal -unit.2.0.waveform.posn.20.channel=50 -unit.2.0.waveform.posn.20.name=DataPort[50] +unit.2.0.waveform.posn.20.channel=58 +unit.2.0.waveform.posn.20.name=DataPort[58] unit.2.0.waveform.posn.20.type=signal -unit.2.0.waveform.posn.21.channel=51 -unit.2.0.waveform.posn.21.name=DataPort[51] +unit.2.0.waveform.posn.21.channel=59 +unit.2.0.waveform.posn.21.name=DataPort[59] unit.2.0.waveform.posn.21.type=signal -unit.2.0.waveform.posn.22.channel=52 -unit.2.0.waveform.posn.22.name=DataPort[52] +unit.2.0.waveform.posn.22.channel=60 +unit.2.0.waveform.posn.22.name=DataPort[60] unit.2.0.waveform.posn.22.type=signal -unit.2.0.waveform.posn.23.channel=53 -unit.2.0.waveform.posn.23.name=DataPort[53] +unit.2.0.waveform.posn.23.channel=61 +unit.2.0.waveform.posn.23.name=DataPort[61] unit.2.0.waveform.posn.23.type=signal -unit.2.0.waveform.posn.24.channel=54 -unit.2.0.waveform.posn.24.name=DataPort[54] +unit.2.0.waveform.posn.24.channel=62 +unit.2.0.waveform.posn.24.name=DataPort[62] unit.2.0.waveform.posn.24.type=signal -unit.2.0.waveform.posn.25.channel=55 -unit.2.0.waveform.posn.25.name=DataPort[55] +unit.2.0.waveform.posn.25.channel=63 +unit.2.0.waveform.posn.25.name=DataPort[63] unit.2.0.waveform.posn.25.type=signal -unit.2.0.waveform.posn.26.channel=56 -unit.2.0.waveform.posn.26.name=DataPort[56] +unit.2.0.waveform.posn.26.channel=63 +unit.2.0.waveform.posn.26.name=DataPort[63] unit.2.0.waveform.posn.26.type=signal -unit.2.0.waveform.posn.27.channel=57 -unit.2.0.waveform.posn.27.name=DataPort[57] +unit.2.0.waveform.posn.27.channel=63 +unit.2.0.waveform.posn.27.name=DataPort[63] unit.2.0.waveform.posn.27.type=signal -unit.2.0.waveform.posn.28.channel=58 -unit.2.0.waveform.posn.28.name=DataPort[58] +unit.2.0.waveform.posn.28.channel=63 +unit.2.0.waveform.posn.28.name=DataPort[63] unit.2.0.waveform.posn.28.type=signal -unit.2.0.waveform.posn.29.channel=59 -unit.2.0.waveform.posn.29.name=DataPort[59] +unit.2.0.waveform.posn.29.channel=63 +unit.2.0.waveform.posn.29.name=DataPort[63] unit.2.0.waveform.posn.29.type=signal -unit.2.0.waveform.posn.3.channel=33 -unit.2.0.waveform.posn.3.name=DataPort[33] +unit.2.0.waveform.posn.3.channel=41 +unit.2.0.waveform.posn.3.name=DataPort[41] unit.2.0.waveform.posn.3.type=signal -unit.2.0.waveform.posn.30.channel=60 -unit.2.0.waveform.posn.30.name=DataPort[60] +unit.2.0.waveform.posn.30.channel=63 +unit.2.0.waveform.posn.30.name=DataPort[63] unit.2.0.waveform.posn.30.type=signal -unit.2.0.waveform.posn.31.channel=61 -unit.2.0.waveform.posn.31.name=DataPort[61] +unit.2.0.waveform.posn.31.channel=63 +unit.2.0.waveform.posn.31.name=DataPort[63] unit.2.0.waveform.posn.31.type=signal -unit.2.0.waveform.posn.32.channel=62 -unit.2.0.waveform.posn.32.name=DataPort[62] +unit.2.0.waveform.posn.32.channel=63 +unit.2.0.waveform.posn.32.name=DataPort[63] unit.2.0.waveform.posn.32.type=signal unit.2.0.waveform.posn.33.channel=63 unit.2.0.waveform.posn.33.name=DataPort[63] @@ -699,8 +699,8 @@ unit.2.0.waveform.posn.38.type=signal unit.2.0.waveform.posn.39.channel=63 unit.2.0.waveform.posn.39.name=DataPort[63] unit.2.0.waveform.posn.39.type=signal -unit.2.0.waveform.posn.4.channel=34 -unit.2.0.waveform.posn.4.name=DataPort[34] +unit.2.0.waveform.posn.4.channel=42 +unit.2.0.waveform.posn.4.name=DataPort[42] unit.2.0.waveform.posn.4.type=signal unit.2.0.waveform.posn.40.channel=63 unit.2.0.waveform.posn.40.name=DataPort[63] @@ -732,8 +732,8 @@ unit.2.0.waveform.posn.48.type=signal unit.2.0.waveform.posn.49.channel=63 unit.2.0.waveform.posn.49.name=DataPort[63] unit.2.0.waveform.posn.49.type=signal -unit.2.0.waveform.posn.5.channel=35 -unit.2.0.waveform.posn.5.name=DataPort[35] +unit.2.0.waveform.posn.5.channel=43 +unit.2.0.waveform.posn.5.name=DataPort[43] unit.2.0.waveform.posn.5.type=signal unit.2.0.waveform.posn.50.channel=63 unit.2.0.waveform.posn.50.name=DataPort[63] @@ -765,8 +765,8 @@ unit.2.0.waveform.posn.58.type=signal unit.2.0.waveform.posn.59.channel=63 unit.2.0.waveform.posn.59.name=DataPort[63] unit.2.0.waveform.posn.59.type=signal -unit.2.0.waveform.posn.6.channel=36 -unit.2.0.waveform.posn.6.name=DataPort[36] +unit.2.0.waveform.posn.6.channel=44 +unit.2.0.waveform.posn.6.name=DataPort[44] unit.2.0.waveform.posn.6.type=signal unit.2.0.waveform.posn.60.channel=63 unit.2.0.waveform.posn.60.name=DataPort[63] @@ -783,12 +783,12 @@ unit.2.0.waveform.posn.63.type=signal unit.2.0.waveform.posn.64.channel=63 unit.2.0.waveform.posn.64.name=DataPort[63] unit.2.0.waveform.posn.64.type=signal -unit.2.0.waveform.posn.7.channel=37 -unit.2.0.waveform.posn.7.name=DataPort[37] +unit.2.0.waveform.posn.7.channel=45 +unit.2.0.waveform.posn.7.name=DataPort[45] unit.2.0.waveform.posn.7.type=signal -unit.2.0.waveform.posn.8.channel=38 -unit.2.0.waveform.posn.8.name=DataPort[38] +unit.2.0.waveform.posn.8.channel=46 +unit.2.0.waveform.posn.8.name=DataPort[46] unit.2.0.waveform.posn.8.type=signal -unit.2.0.waveform.posn.9.channel=39 -unit.2.0.waveform.posn.9.name=DataPort[39] +unit.2.0.waveform.posn.9.channel=47 +unit.2.0.waveform.posn.9.name=DataPort[47] unit.2.0.waveform.posn.9.type=signal diff --git a/ethernet/source/top.vhd b/ethernet/source/top.vhd index 022a476..f7c5bd9 100644 --- a/ethernet/source/top.vhd +++ b/ethernet/source/top.vhd @@ -274,8 +274,9 @@ data(40) <= MD_PAD_IO; data(41) <= md_pad_o; data(42) <= md_padoe_o; data(43) <= mdc_pad_o_watch; +data(44) <= pci_inta_o; MDC_PAD_O <= mdc_pad_o_watch; -data(63 downto 44) <= (others => '0'); +data(63 downto 45) <= (others => '0'); trig0(31 downto 0) <= ( 0 => wb_stb_i,