X-Git-Url: http://git.joshuawise.com/mandelfpga.git/blobdiff_plain/3068fa611c7bfac974131f874165b002b5f20607..251788d85bd34ae72b677875e924d56768b409f7:/Main.v

diff --git a/Main.v b/Main.v
index 11d7833..3dc546b 100644
--- a/Main.v
+++ b/Main.v
@@ -262,21 +262,21 @@ module Mandelbrot(
 	                stageci[2];
 	
 	reg [7:0] out;
-	reg typethea = 0;	// Whether we have typed the A.
-	reg statekick = 0;	// State needs to be kicked back to 3'b010 on the next mclk.
-
-	// This is guaranteed to converge after two pixclks.
-	//always @(negedge mclk)
-	//	if (pixclk && !typethea) begin
-	//		typethea <= 1;
-	//		statekick <= 1;
-	//	end else if (typethea) begin // This is the edge of the falling anus.
-	//		typethea <= 0;
-	//		statekick <= 0;
-	//	end
+	
+	// We detect when the state should be poked by a high negedge followed
+	// by a high posedge -- if tha thappens, then we're guaranteed that the
+	// state following the current state will be 100.
+	reg lastneg;
+	always @(negedge mclk)
+		lastneg <= pixclk;
 	
 	always @(posedge mclk)
 	begin
+		if (lastneg && pixclk)	// If a pixclk has happened, the state should be reset.
+			state <= 3'b100;
+		else						// Otherwise, just poke it forward.
+			state <= {state[1], state[0], state[2]};
+	
 		// Data output handling
 		if (state[0]) begin
 			{red, green, blue} <= {out[0],out[3],out[6],out[1],out[4],out[7],out[2],out[5]};
@@ -310,11 +310,6 @@ module Mandelbrot(
 			stageb[1] <= mb[`MAXOUTN];
 			stageci[1] <= curiter[`MAXOUTN];
 		end
-		
-		if (statekick)		// If a pixclk has happened, the state should be reset.
-			state <= 3'b010;
-		else						// Otherwise, just poke it forward.
-			state <= {state[1], state[0], state[2]};
 	end
 
 	MandelUnit mu0(
@@ -391,21 +386,28 @@ 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)
+	//	);
 	
-	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)
+    );
 	
 	wire border;
 	wire [11:0] x, y;