X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/fpga-games/blobdiff_plain/36a47d3c8d89db7f85847c9d0b8985a52a914409..4b3ff7d86485dea579af0d8fd983a36a1e9295ea:/galaxian/src/mc_top.v

diff --git a/galaxian/src/mc_top.v b/galaxian/src/mc_top.v
index 99a4a6a..99206f3 100644
--- a/galaxian/src/mc_top.v
+++ b/galaxian/src/mc_top.v
@@ -89,15 +89,17 @@ output O_VGA_V_SYNCn;
 
 wire   W_RESETn = |(~I_PSW[8:5]);
 //------ CLOCK GEN ---------------------------
-wire   I_CLK_18432M;
+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;
 
 mc_dcm clockgen(
 .CLKIN_IN(I_CLK_125M),
 .RST_IN(! W_RESETn),
-.CLKFX_OUT(I_CLK_18432M)
+.CLKFX_OUT(W_CLK_36M)
 );
 
 //------ H&V COUNTER -------------------------
@@ -144,20 +146,16 @@ wire   [7:0]W_VID_DO;
 
 mc_clock MC_CLK(
 
-.I_CLK_18M(I_CLK_18432M),
+.I_CLK_36M(W_CLK_36M),
+.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 ;
@@ -329,7 +327,7 @@ wire	VIB_SW = died & (&on_game[1:0]);
 
 fpga_arcade_if pspad(
 
-.CLK_18M432(I_CLK_18432M),
+.CLK_18M432(W_CLK_18M),
 .I_RSTn(W_RESETn),
 .psCLK(psCLK),
 .psSEL(psSEL),
@@ -444,9 +442,10 @@ wire   [1:0]W_VID;
 wire   [2:0]W_COL;
 
 mc_video MC_VID(
-.I_CLK_18M(I_CLK_18432M),
+.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),
@@ -503,7 +502,7 @@ wire   [1:0]W_STARS_B;
 
 mc_stars MC_STARS( 
 
-.I_CLK_18M(I_CLK_18432M),
+.I_CLK_18M(W_CLK_18M),
 `ifdef DEVICE_CYCLONE
 .I_CLK_6M(~WB_CLK_6M),
 `endif
@@ -615,7 +614,7 @@ wire   [7:0]W_SDAT_B;
 
 mc_sound_b MC_SOUND_B(
 
-.I_CLK1(I_CLK_18432M),
+.I_CLK1(W_CLK_18M),
 .I_CLK2(W_CLK_6M),
 .I_RSTn(rst_count[3]),
 .I_SW({&on_game[1:0],W_HIT,W_FIRE}),
@@ -639,7 +638,7 @@ assign  O_SOUND_OUT_R = W_DAC_B;
 
 dac wav_dac_a(
 
-.Clk(I_CLK_18432M), 
+.Clk(W_CLK_18M), 
 .Reset(~W_RESETn),
 .DACin(W_SDAT_A),
 .DACout(W_DAC_A)
@@ -648,7 +647,7 @@ dac wav_dac_a(
 
 dac wav_dac_b(
 
-.Clk(I_CLK_18432M), 
+.Clk(W_CLK_18M), 
 .Reset(~W_RESETn),
 .DACin(W_SDAT_B),
 .DACout(W_DAC_B)