X-Git-Url: http://git.joshuawise.com/mandelfpga.git/blobdiff_plain/251788d85bd34ae72b677875e924d56768b409f7..c3ed4329c4a2afcf90da4d9d26aae5b5af97c1e6:/Main.v diff --git a/Main.v b/Main.v index 3dc546b..40eac0b 100644 --- a/Main.v +++ b/Main.v @@ -386,28 +386,21 @@ module MandelTop( wire pixclk, mclk, gclk2, clk; wire dcm1ok, dcm2ok; - //assign dcmok = dcm1ok && dcm2ok; + assign dcmok = dcm1ok && dcm2ok; - //IBUFG typeA(.O(clk), .I(gclk)); + IBUFG typeA(.O(clk), .I(gclk)); - //pixDCM dcm( // CLKIN is 50MHz xtal, CLKFX_OUT is 25MHz - // .CLKIN_IN(clk), - // .CLKFX_OUT(pixclk), - // .LOCKED_OUT(dcm1ok) - // ); + pixDCM dcm( // CLKIN is 50MHz xtal, CLKFX_OUT is 25MHz + .CLKIN_IN(clk), + .CLKFX_OUT(pixclk), + .LOCKED_OUT(dcm1ok) + ); - //mandelDCM dcm2( - // .CLKIN_IN(clk), - // .CLKFX_OUT(mclk), - // .LOCKED_OUT(dcm2ok) - // ); - - mainDCM dcm ( - .U1_CLKIN_IN(gclk), - .U1_CLKDV_OUT(pixclk), - .U2_CLKFX_OUT(mclk), - .U2_LOCKED_OUT(dcmok) - ); + mandelDCM dcm2( + .CLKIN_IN(clk), + .CLKFX_OUT(mclk), + .LOCKED_OUT(dcm2ok) + ); wire border; wire [11:0] x, y;