X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/fpga-games/blobdiff_plain/c3bcc38aaf21ce2036ea66b9e5f764e6d3e7ac7f..fb335bc24ef27a3531085ad9a54aacd89882e41a:/galaxian/src/mc_top.v

diff --git a/galaxian/src/mc_top.v b/galaxian/src/mc_top.v
index 4cabd74..c99fcd8 100644
--- a/galaxian/src/mc_top.v
+++ b/galaxian/src/mc_top.v
@@ -93,12 +93,15 @@ wire   W_CLK_18M;
 wire   W_CLK_36M;
 wire   W_CLK_12M,WB_CLK_12M;
 wire   W_CLK_6M,WB_CLK_6M;
+wire   W_CLK_6Mn;
 wire   W_STARS_CLK;
+wire   W_DCM_LOCKED;
 
 mc_dcm clockgen(
 .CLKIN_IN(I_CLK_125M),
 .RST_IN(! W_RESETn),
-.CLKFX_OUT(W_CLK_36M)
+.CLKFX_OUT(W_CLK_36M),
+.LOCKED_OUT(W_DCM_LOCKED)
 );
 
 //------ H&V COUNTER -------------------------
@@ -146,20 +149,16 @@ wire   [7:0]W_VID_DO;
 mc_clock MC_CLK(
 
 .I_CLK_36M(W_CLK_36M),
+.I_DCM_LOCKED(W_DCM_LOCKED),
 .O_CLK_18M(W_CLK_18M),
 .O_CLK_12M(WB_CLK_12M),
-.O_CLK_06M(WB_CLK_6M)
+.O_CLK_06M(WB_CLK_6M),
+.O_CLK_06Mn(W_CLK_6Mn)
 
 );
 
-`ifdef DEVICE_CYCLONE
 assign W_CLK_12M = WB_CLK_12M;
 assign W_CLK_6M  = WB_CLK_6M;
-`endif
-`ifdef DEVICE_SPARTAN2E
-BUFG	BUFG_12MHz( .I(WB_CLK_12M),.O(W_CLK_12M) );
-BUFG	BUFG_6MHz ( .I(WB_CLK_6M ),.O(W_CLK_6M ) );
-`endif
 //---  DATA I/F -------------------------------------
 reg    [7:0]W_CPU_ROM_DO;
 wire   [7:0]W_CPU_ROM_DOB = W_CPU_ROM_CSn ? 8'h00: W_CPU_ROM_DO ;
@@ -449,6 +448,7 @@ mc_video MC_VID(
 .I_CLK_18M(W_CLK_18M),
 .I_CLK_12M(W_CLK_12M),
 .I_CLK_6M(W_CLK_6M),
+.I_CLK_6Mn(W_CLK_6Mn),
 .I_H_CNT(W_H_CNT),
 .I_V_CNT(W_V_CNT),
 .I_H_FLIP(W_H_FLIP),