X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/fpga-games/blobdiff_plain/782690d0b2046d5fa0ae296c2fb3f411d668b5dc..b884ab49c82cc350e3d74264cff4b9da0d664878:/galaxian/src/mc_top.v

diff --git a/galaxian/src/mc_top.v b/galaxian/src/mc_top.v
index 58bc3c0..d8508d1 100644
--- a/galaxian/src/mc_top.v
+++ b/galaxian/src/mc_top.v
@@ -88,29 +88,29 @@ output	psTXD,psCLK,psSEL;
 //output O_ROM_WEn;
 
 //    INPORT SW IF
-input  [4:0]I_PSW;
+input  [8:0]I_PSW;
 
 //    SOUND OUT 
 output  O_SOUND_OUT_L;
 output  O_SOUND_OUT_R;
 
 //    VGA (VIDEO) IF
-output [4:0]O_VGA_R;
-output [4:0]O_VGA_G;
-output [4:0]O_VGA_B;
+output [2:0]O_VGA_R;
+output [2:0]O_VGA_G;
+output [1:0]O_VGA_B;
 output O_VGA_H_SYNCn;
 output O_VGA_V_SYNCn;
 
-wire   W_RESETn = |I_PSW[3:0];
+wire   W_RESETn = |(~I_PSW[8:5]);
 //------ CLOCK GEN ---------------------------
 wire   I_CLK_18432M;
 wire   W_CLK_12M,WB_CLK_12M;
 wire   W_CLK_6M,WB_CLK_6M;
 wire   W_STARS_CLK;
 
-dcm clockgen(
+mc_dcm clockgen(
 .CLKIN_IN(I_CLK_125M),
-.RST_IN(W_RESETn),
+.RST_IN(! W_RESETn),
 .CLKFX_OUT(I_CLK_18432M)
 );
 
@@ -367,18 +367,18 @@ wire   S2 = (D1|J1)  & ps_PSW[7];
 
 wire   C1 = (L1|R1|U1|~D1) & ps_PSW[4];
 `else
-wire   L1 = I_PSW[2];
-wire   R1 = I_PSW[3];
-wire   U1 = I_PSW[0];
-wire   D1 = I_PSW[1];
-wire   J1 = I_PSW[4];
+wire   L1 = ! I_PSW[2];
+wire   R1 = ! I_PSW[3];
+wire   U1 = ! I_PSW[0];
+wire   D1 = ! I_PSW[1];
+wire   J1 = ! I_PSW[4];
 
-wire   S1 = U1|J1;
-wire   S2 = D1|J1;
+wire   S1 = ! I_PSW[5];
+wire   S2 = ! I_PSW[7];
 
-wire   C1 = L1|R1|U1|~D1;
+wire   C1 = ! I_PSW[6];
 `endif
-wire   C2 = L1|R1|~U1|D1;
+wire   C2 = ! I_PSW[8];
 
 wire   L2 = L1;
 wire   R2 = R1;
@@ -425,7 +425,6 @@ wire   [7:0]ROM_D; // = I_ROM_DB;
 //assign O_ROM_WEn = 1'b1;
 
 galaxian_roms ROMS(
-.I_CLK_18432M(I_CLK_18432M),
 .I_CLK_12M(WB_CLK_12M),
 .I_ADDR(ROM_A),
 .O_DATA(ROM_D)
@@ -644,13 +643,10 @@ mc_vga_if  VGA(
 `else
 
 assign O_VGA_R[2:0] = W_R;
-assign O_VGA_R[4:3] = 1'b0;
 
 assign O_VGA_G[2:0] = W_G;
-assign O_VGA_G[4:3] = 1'b0;
 
 assign O_VGA_B[1:0] = W_B;
-assign O_VGA_B[4:2] = 1'b0;
 
 //assign O_VGA_H_SYNCn = W_H_SYNC | W_V_SYNC ;  //  AKIDUKI LCD USED
 assign O_VGA_H_SYNCn = ~W_H_SYNC ;