From: michael Date: Wed, 21 Mar 2007 20:58:41 +0000 (+0000) Subject: fix chipscope signals X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/raggedstone/commitdiff_plain/fcff4515c62160dba7e30ef1e9b4180f53249c40?ds=sidebyside fix chipscope signals --- diff --git a/ethernet/ethernet.cpj b/ethernet/ethernet.cpj index 8e108ac..da54ba9 100644 --- a/ethernet/ethernet.cpj +++ b/ethernet/ethernet.cpj @@ -1,5 +1,5 @@ #ChipScope Pro Analyzer Project File, Version 3.0 -#Wed Mar 21 12:40:18 GMT+01:00 2007 +#Wed Mar 21 21:48:13 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.8069364161849711 -mdiAreaHeightLast=0.8069364161849711 +mdiAreaHeight=0.8145065398335315 +mdiAreaHeightLast=0.8145065398335315 mdiCount=2 mdiDevice0=2 mdiDevice1=2 @@ -19,23 +19,23 @@ mdiType0=1 mdiType1=0 mdiUnit0=0 mdiUnit1=0 -navigatorHeight=0.1815028901734104 -navigatorHeightLast=0.1815028901734104 -navigatorWidth=0.18109452736318407 -navigatorWidthLast=0.18109452736318407 +navigatorHeight=0.18311533888228299 +navigatorHeightLast=0.18311533888228299 +navigatorWidth=0.18256410256410258 +navigatorWidthLast=0.18256410256410258 unit.-1.-1.username= -unit.2.0.0.HEIGHT0=0.29640287 +unit.2.0.0.HEIGHT0=0.3020528 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.657554 +unit.2.0.1.HEIGHT1=0.6568915 unit.2.0.1.WIDTH1=1.0 unit.2.0.1.X1=0.0 -unit.2.0.1.Y1=0.29640287 -unit.2.0.MFBitsA0=1XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX +unit.2.0.1.Y1=0.29618767 +unit.2.0.MFBitsA0=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX unit.2.0.MFBitsB0=00000000000000000000000000000000 unit.2.0.MFCompareA0=0 unit.2.0.MFCompareB0=999 @@ -74,7 +74,21 @@ unit.2.0.port.-1.b.0.unsignedOffset=0.0 unit.2.0.port.-1.b.0.unsignedPrecision=0 unit.2.0.port.-1.b.0.unsignedScaleFactor=1.0 unit.2.0.port.-1.b.0.visible=1 -unit.2.0.port.-1.buscount=1 +unit.2.0.port.-1.b.1.alias=DataPort_1 +unit.2.0.port.-1.b.1.channellist=32 33 34 35 36 37 38 39 +unit.2.0.port.-1.b.1.color=java.awt.Color[r\=0,g\=0,b\=124] +unit.2.0.port.-1.b.1.name=DataPort_1 +unit.2.0.port.-1.b.1.orderindex=-1 +unit.2.0.port.-1.b.1.radix=Hex +unit.2.0.port.-1.b.1.signedOffset=0.0 +unit.2.0.port.-1.b.1.signedPrecision=0 +unit.2.0.port.-1.b.1.signedScaleFactor=1.0 +unit.2.0.port.-1.b.1.tokencount=0 +unit.2.0.port.-1.b.1.unsignedOffset=0.0 +unit.2.0.port.-1.b.1.unsignedPrecision=0 +unit.2.0.port.-1.b.1.unsignedScaleFactor=1.0 +unit.2.0.port.-1.b.1.visible=1 +unit.2.0.port.-1.buscount=2 unit.2.0.port.-1.channelcount=64 unit.2.0.port.-1.s.0.alias= unit.2.0.port.-1.s.0.color=java.awt.Color[r\=0,g\=0,b\=124] @@ -580,200 +594,201 @@ 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=65 +unit.2.0.waveform.count=34 unit.2.0.waveform.posn.0.channel=2147483646 -unit.2.0.waveform.posn.0.name=DataPort +unit.2.0.waveform.posn.0.name=DataPort_1 unit.2.0.waveform.posn.0.radix=1 unit.2.0.waveform.posn.0.type=bus -unit.2.0.waveform.posn.1.channel=0 -unit.2.0.waveform.posn.1.name=DataPort[0] -unit.2.0.waveform.posn.1.type=signal -unit.2.0.waveform.posn.10.channel=9 -unit.2.0.waveform.posn.10.name=DataPort[9] +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.type=signal -unit.2.0.waveform.posn.11.channel=10 -unit.2.0.waveform.posn.11.name=DataPort[10] +unit.2.0.waveform.posn.11.channel=41 +unit.2.0.waveform.posn.11.name=DataPort[41] unit.2.0.waveform.posn.11.type=signal -unit.2.0.waveform.posn.12.channel=11 -unit.2.0.waveform.posn.12.name=DataPort[11] +unit.2.0.waveform.posn.12.channel=42 +unit.2.0.waveform.posn.12.name=DataPort[42] unit.2.0.waveform.posn.12.type=signal -unit.2.0.waveform.posn.13.channel=12 -unit.2.0.waveform.posn.13.name=DataPort[12] +unit.2.0.waveform.posn.13.channel=43 +unit.2.0.waveform.posn.13.name=DataPort[43] unit.2.0.waveform.posn.13.type=signal -unit.2.0.waveform.posn.14.channel=13 -unit.2.0.waveform.posn.14.name=DataPort[13] +unit.2.0.waveform.posn.14.channel=44 +unit.2.0.waveform.posn.14.name=DataPort[44] unit.2.0.waveform.posn.14.type=signal -unit.2.0.waveform.posn.15.channel=14 -unit.2.0.waveform.posn.15.name=DataPort[14] +unit.2.0.waveform.posn.15.channel=45 +unit.2.0.waveform.posn.15.name=DataPort[45] unit.2.0.waveform.posn.15.type=signal -unit.2.0.waveform.posn.16.channel=15 -unit.2.0.waveform.posn.16.name=DataPort[15] +unit.2.0.waveform.posn.16.channel=46 +unit.2.0.waveform.posn.16.name=DataPort[46] unit.2.0.waveform.posn.16.type=signal -unit.2.0.waveform.posn.17.channel=16 -unit.2.0.waveform.posn.17.name=DataPort[16] +unit.2.0.waveform.posn.17.channel=47 +unit.2.0.waveform.posn.17.name=DataPort[47] unit.2.0.waveform.posn.17.type=signal -unit.2.0.waveform.posn.18.channel=17 -unit.2.0.waveform.posn.18.name=DataPort[17] +unit.2.0.waveform.posn.18.channel=48 +unit.2.0.waveform.posn.18.name=DataPort[48] unit.2.0.waveform.posn.18.type=signal -unit.2.0.waveform.posn.19.channel=18 -unit.2.0.waveform.posn.19.name=DataPort[18] +unit.2.0.waveform.posn.19.channel=49 +unit.2.0.waveform.posn.19.name=DataPort[49] unit.2.0.waveform.posn.19.type=signal -unit.2.0.waveform.posn.2.channel=1 -unit.2.0.waveform.posn.2.name=DataPort[1] +unit.2.0.waveform.posn.2.channel=32 +unit.2.0.waveform.posn.2.name=DataPort[32] unit.2.0.waveform.posn.2.type=signal -unit.2.0.waveform.posn.20.channel=19 -unit.2.0.waveform.posn.20.name=DataPort[19] +unit.2.0.waveform.posn.20.channel=50 +unit.2.0.waveform.posn.20.name=DataPort[50] unit.2.0.waveform.posn.20.type=signal -unit.2.0.waveform.posn.21.channel=20 -unit.2.0.waveform.posn.21.name=DataPort[20] +unit.2.0.waveform.posn.21.channel=51 +unit.2.0.waveform.posn.21.name=DataPort[51] unit.2.0.waveform.posn.21.type=signal -unit.2.0.waveform.posn.22.channel=21 -unit.2.0.waveform.posn.22.name=DataPort[21] +unit.2.0.waveform.posn.22.channel=52 +unit.2.0.waveform.posn.22.name=DataPort[52] unit.2.0.waveform.posn.22.type=signal -unit.2.0.waveform.posn.23.channel=22 -unit.2.0.waveform.posn.23.name=DataPort[22] +unit.2.0.waveform.posn.23.channel=53 +unit.2.0.waveform.posn.23.name=DataPort[53] unit.2.0.waveform.posn.23.type=signal -unit.2.0.waveform.posn.24.channel=23 -unit.2.0.waveform.posn.24.name=DataPort[23] +unit.2.0.waveform.posn.24.channel=54 +unit.2.0.waveform.posn.24.name=DataPort[54] unit.2.0.waveform.posn.24.type=signal -unit.2.0.waveform.posn.25.channel=24 -unit.2.0.waveform.posn.25.name=DataPort[24] +unit.2.0.waveform.posn.25.channel=55 +unit.2.0.waveform.posn.25.name=DataPort[55] unit.2.0.waveform.posn.25.type=signal -unit.2.0.waveform.posn.26.channel=25 -unit.2.0.waveform.posn.26.name=DataPort[25] +unit.2.0.waveform.posn.26.channel=56 +unit.2.0.waveform.posn.26.name=DataPort[56] unit.2.0.waveform.posn.26.type=signal -unit.2.0.waveform.posn.27.channel=26 -unit.2.0.waveform.posn.27.name=DataPort[26] +unit.2.0.waveform.posn.27.channel=57 +unit.2.0.waveform.posn.27.name=DataPort[57] unit.2.0.waveform.posn.27.type=signal -unit.2.0.waveform.posn.28.channel=27 -unit.2.0.waveform.posn.28.name=DataPort[27] +unit.2.0.waveform.posn.28.channel=58 +unit.2.0.waveform.posn.28.name=DataPort[58] unit.2.0.waveform.posn.28.type=signal -unit.2.0.waveform.posn.29.channel=28 -unit.2.0.waveform.posn.29.name=DataPort[28] +unit.2.0.waveform.posn.29.channel=59 +unit.2.0.waveform.posn.29.name=DataPort[59] unit.2.0.waveform.posn.29.type=signal -unit.2.0.waveform.posn.3.channel=2 -unit.2.0.waveform.posn.3.name=DataPort[2] +unit.2.0.waveform.posn.3.channel=33 +unit.2.0.waveform.posn.3.name=DataPort[33] unit.2.0.waveform.posn.3.type=signal -unit.2.0.waveform.posn.30.channel=29 -unit.2.0.waveform.posn.30.name=DataPort[29] +unit.2.0.waveform.posn.30.channel=60 +unit.2.0.waveform.posn.30.name=DataPort[60] unit.2.0.waveform.posn.30.type=signal -unit.2.0.waveform.posn.31.channel=30 -unit.2.0.waveform.posn.31.name=DataPort[30] +unit.2.0.waveform.posn.31.channel=61 +unit.2.0.waveform.posn.31.name=DataPort[61] unit.2.0.waveform.posn.31.type=signal -unit.2.0.waveform.posn.32.channel=31 -unit.2.0.waveform.posn.32.name=DataPort[31] +unit.2.0.waveform.posn.32.channel=62 +unit.2.0.waveform.posn.32.name=DataPort[62] unit.2.0.waveform.posn.32.type=signal -unit.2.0.waveform.posn.33.channel=32 -unit.2.0.waveform.posn.33.name=DataPort[32] +unit.2.0.waveform.posn.33.channel=63 +unit.2.0.waveform.posn.33.name=DataPort[63] unit.2.0.waveform.posn.33.type=signal -unit.2.0.waveform.posn.34.channel=33 -unit.2.0.waveform.posn.34.name=DataPort[33] +unit.2.0.waveform.posn.34.channel=63 +unit.2.0.waveform.posn.34.name=DataPort[63] unit.2.0.waveform.posn.34.type=signal -unit.2.0.waveform.posn.35.channel=34 -unit.2.0.waveform.posn.35.name=DataPort[34] +unit.2.0.waveform.posn.35.channel=63 +unit.2.0.waveform.posn.35.name=DataPort[63] unit.2.0.waveform.posn.35.type=signal -unit.2.0.waveform.posn.36.channel=35 -unit.2.0.waveform.posn.36.name=DataPort[35] +unit.2.0.waveform.posn.36.channel=63 +unit.2.0.waveform.posn.36.name=DataPort[63] unit.2.0.waveform.posn.36.type=signal -unit.2.0.waveform.posn.37.channel=36 -unit.2.0.waveform.posn.37.name=DataPort[36] +unit.2.0.waveform.posn.37.channel=63 +unit.2.0.waveform.posn.37.name=DataPort[63] unit.2.0.waveform.posn.37.type=signal -unit.2.0.waveform.posn.38.channel=37 -unit.2.0.waveform.posn.38.name=DataPort[37] +unit.2.0.waveform.posn.38.channel=63 +unit.2.0.waveform.posn.38.name=DataPort[63] unit.2.0.waveform.posn.38.type=signal -unit.2.0.waveform.posn.39.channel=38 -unit.2.0.waveform.posn.39.name=DataPort[38] +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=3 -unit.2.0.waveform.posn.4.name=DataPort[3] +unit.2.0.waveform.posn.4.channel=34 +unit.2.0.waveform.posn.4.name=DataPort[34] unit.2.0.waveform.posn.4.type=signal -unit.2.0.waveform.posn.40.channel=39 -unit.2.0.waveform.posn.40.name=DataPort[39] +unit.2.0.waveform.posn.40.channel=63 +unit.2.0.waveform.posn.40.name=DataPort[63] unit.2.0.waveform.posn.40.type=signal -unit.2.0.waveform.posn.41.channel=40 -unit.2.0.waveform.posn.41.name=DataPort[40] +unit.2.0.waveform.posn.41.channel=63 +unit.2.0.waveform.posn.41.name=DataPort[63] unit.2.0.waveform.posn.41.type=signal -unit.2.0.waveform.posn.42.channel=41 -unit.2.0.waveform.posn.42.name=DataPort[41] +unit.2.0.waveform.posn.42.channel=63 +unit.2.0.waveform.posn.42.name=DataPort[63] unit.2.0.waveform.posn.42.type=signal -unit.2.0.waveform.posn.43.channel=42 -unit.2.0.waveform.posn.43.name=DataPort[42] +unit.2.0.waveform.posn.43.channel=63 +unit.2.0.waveform.posn.43.name=DataPort[63] unit.2.0.waveform.posn.43.type=signal -unit.2.0.waveform.posn.44.channel=43 -unit.2.0.waveform.posn.44.name=DataPort[43] +unit.2.0.waveform.posn.44.channel=63 +unit.2.0.waveform.posn.44.name=DataPort[63] unit.2.0.waveform.posn.44.type=signal -unit.2.0.waveform.posn.45.channel=44 -unit.2.0.waveform.posn.45.name=DataPort[44] +unit.2.0.waveform.posn.45.channel=63 +unit.2.0.waveform.posn.45.name=DataPort[63] unit.2.0.waveform.posn.45.type=signal -unit.2.0.waveform.posn.46.channel=45 -unit.2.0.waveform.posn.46.name=DataPort[45] +unit.2.0.waveform.posn.46.channel=63 +unit.2.0.waveform.posn.46.name=DataPort[63] unit.2.0.waveform.posn.46.type=signal -unit.2.0.waveform.posn.47.channel=46 -unit.2.0.waveform.posn.47.name=DataPort[46] +unit.2.0.waveform.posn.47.channel=63 +unit.2.0.waveform.posn.47.name=DataPort[63] unit.2.0.waveform.posn.47.type=signal -unit.2.0.waveform.posn.48.channel=47 -unit.2.0.waveform.posn.48.name=DataPort[47] +unit.2.0.waveform.posn.48.channel=63 +unit.2.0.waveform.posn.48.name=DataPort[63] unit.2.0.waveform.posn.48.type=signal -unit.2.0.waveform.posn.49.channel=48 -unit.2.0.waveform.posn.49.name=DataPort[48] +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=4 -unit.2.0.waveform.posn.5.name=DataPort[4] +unit.2.0.waveform.posn.5.channel=35 +unit.2.0.waveform.posn.5.name=DataPort[35] unit.2.0.waveform.posn.5.type=signal -unit.2.0.waveform.posn.50.channel=49 -unit.2.0.waveform.posn.50.name=DataPort[49] +unit.2.0.waveform.posn.50.channel=63 +unit.2.0.waveform.posn.50.name=DataPort[63] unit.2.0.waveform.posn.50.type=signal -unit.2.0.waveform.posn.51.channel=50 -unit.2.0.waveform.posn.51.name=DataPort[50] +unit.2.0.waveform.posn.51.channel=63 +unit.2.0.waveform.posn.51.name=DataPort[63] unit.2.0.waveform.posn.51.type=signal -unit.2.0.waveform.posn.52.channel=51 -unit.2.0.waveform.posn.52.name=DataPort[51] +unit.2.0.waveform.posn.52.channel=63 +unit.2.0.waveform.posn.52.name=DataPort[63] unit.2.0.waveform.posn.52.type=signal -unit.2.0.waveform.posn.53.channel=52 -unit.2.0.waveform.posn.53.name=DataPort[52] +unit.2.0.waveform.posn.53.channel=63 +unit.2.0.waveform.posn.53.name=DataPort[63] unit.2.0.waveform.posn.53.type=signal -unit.2.0.waveform.posn.54.channel=53 -unit.2.0.waveform.posn.54.name=DataPort[53] +unit.2.0.waveform.posn.54.channel=63 +unit.2.0.waveform.posn.54.name=DataPort[63] unit.2.0.waveform.posn.54.type=signal -unit.2.0.waveform.posn.55.channel=54 -unit.2.0.waveform.posn.55.name=DataPort[54] +unit.2.0.waveform.posn.55.channel=63 +unit.2.0.waveform.posn.55.name=DataPort[63] unit.2.0.waveform.posn.55.type=signal -unit.2.0.waveform.posn.56.channel=55 -unit.2.0.waveform.posn.56.name=DataPort[55] +unit.2.0.waveform.posn.56.channel=63 +unit.2.0.waveform.posn.56.name=DataPort[63] unit.2.0.waveform.posn.56.type=signal -unit.2.0.waveform.posn.57.channel=56 -unit.2.0.waveform.posn.57.name=DataPort[56] +unit.2.0.waveform.posn.57.channel=63 +unit.2.0.waveform.posn.57.name=DataPort[63] unit.2.0.waveform.posn.57.type=signal -unit.2.0.waveform.posn.58.channel=57 -unit.2.0.waveform.posn.58.name=DataPort[57] +unit.2.0.waveform.posn.58.channel=63 +unit.2.0.waveform.posn.58.name=DataPort[63] unit.2.0.waveform.posn.58.type=signal -unit.2.0.waveform.posn.59.channel=58 -unit.2.0.waveform.posn.59.name=DataPort[58] +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=5 -unit.2.0.waveform.posn.6.name=DataPort[5] +unit.2.0.waveform.posn.6.channel=36 +unit.2.0.waveform.posn.6.name=DataPort[36] unit.2.0.waveform.posn.6.type=signal -unit.2.0.waveform.posn.60.channel=59 -unit.2.0.waveform.posn.60.name=DataPort[59] +unit.2.0.waveform.posn.60.channel=63 +unit.2.0.waveform.posn.60.name=DataPort[63] unit.2.0.waveform.posn.60.type=signal -unit.2.0.waveform.posn.61.channel=60 -unit.2.0.waveform.posn.61.name=DataPort[60] +unit.2.0.waveform.posn.61.channel=63 +unit.2.0.waveform.posn.61.name=DataPort[63] unit.2.0.waveform.posn.61.type=signal -unit.2.0.waveform.posn.62.channel=61 -unit.2.0.waveform.posn.62.name=DataPort[61] +unit.2.0.waveform.posn.62.channel=63 +unit.2.0.waveform.posn.62.name=DataPort[63] unit.2.0.waveform.posn.62.type=signal -unit.2.0.waveform.posn.63.channel=62 -unit.2.0.waveform.posn.63.name=DataPort[62] +unit.2.0.waveform.posn.63.channel=63 +unit.2.0.waveform.posn.63.name=DataPort[63] 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=6 -unit.2.0.waveform.posn.7.name=DataPort[6] +unit.2.0.waveform.posn.7.channel=37 +unit.2.0.waveform.posn.7.name=DataPort[37] unit.2.0.waveform.posn.7.type=signal -unit.2.0.waveform.posn.8.channel=7 -unit.2.0.waveform.posn.8.name=DataPort[7] +unit.2.0.waveform.posn.8.channel=38 +unit.2.0.waveform.posn.8.name=DataPort[38] unit.2.0.waveform.posn.8.type=signal -unit.2.0.waveform.posn.9.channel=8 -unit.2.0.waveform.posn.9.name=DataPort[8] +unit.2.0.waveform.posn.9.channel=39 +unit.2.0.waveform.posn.9.name=DataPort[39] unit.2.0.waveform.posn.9.type=signal diff --git a/ethernet/ethernet.xst b/ethernet/ethernet.xst index 48caa9c..4192582 100644 --- a/ethernet/ethernet.xst +++ b/ethernet/ethernet.xst @@ -8,7 +8,7 @@ run -top ethernet -opt_mode Speed -opt_level 1 --iuc YES +-iuc NO -lso ethernet.lso -keep_hierarchy NO -glob_opt AllClockNets diff --git a/ethernet/source/top.vhd b/ethernet/source/top.vhd index 9bb2d48..022a476 100644 --- a/ethernet/source/top.vhd +++ b/ethernet/source/top.vhd @@ -269,13 +269,13 @@ wb_adr_i(7 downto 2) <= wbm_adr_o (7 downto 2); wb_clk_i <= PCI_CLOCK; data(31 downto 0) <= wbm_adr_o; -data(40 downto 33) <= wbm_adr_o (7 downto 0); -data(41) <= MD_PAD_IO; -data(42) <= md_pad_o; -data(43) <= md_padoe_o; -data(44) <= mdc_pad_o_watch; +data(39 downto 32) <= wbm_adr_o (7 downto 0); +data(40) <= MD_PAD_IO; +data(41) <= md_pad_o; +data(42) <= md_padoe_o; +data(43) <= mdc_pad_o_watch; MDC_PAD_O <= mdc_pad_o_watch; -data(63 downto 45) <= (others => '0'); +data(63 downto 44) <= (others => '0'); trig0(31 downto 0) <= ( 0 => wb_stb_i,