fix vga colours

diff --git a/galaxian/galaxian.ucf b/galaxian/galaxian.ucf
index 6fb6807e5c216fec23fde2cf01c4fa4b83406c5e..3a8e0118a815c08483a9cfb3676b8a3a3707b44d 100644 (file)
--- a/galaxian/galaxian.ucf
+++ b/galaxian/galaxian.ucf
@@ -51,21 +51,14 @@ NET "O_SOUND_OUT_L" LOC = "AA22" | IOSTANDARD = LVTTL | SLEW = SLOW | DRIVE = 8;
 NET "O_SOUND_OUT_R" LOC = "V19" | IOSTANDARD = LVTTL | SLEW = SLOW | DRIVE = 8;
 #-------------------------------------------
 #--------- VIDEO I/F -----------------------
-NET "O_VGA_R<0>" LOC = "V18" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_R<1>" LOC = "F24" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_R<2>" LOC = "F25" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_R<3>" LOC = "K20" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_R<4>" LOC = "L20" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_G<0>" LOC = "T17" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_G<1>" LOC = "J22" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_G<2>" LOC = "J23" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_G<3>" LOC = "M18" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_G<4>" LOC = "M19" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_B<0>" LOC = "Y25" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_B<1>" LOC = "G24" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_B<2>" LOC = "G23"  | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_B<3>" LOC = "K21"  | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
-NET "O_VGA_B<4>" LOC = "L22"  | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_R<2>" LOC = "K20" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_R<1>" LOC = "F25" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_R<0>" LOC = "F24" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_G<2>" LOC = "M18" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_G<1>" LOC = "J23" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_G<0>" LOC = "J22" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_B<1>" LOC = "G23" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
+NET "O_VGA_B<0>" LOC = "G24" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
 
 NET "O_VGA_H_SYNCn" LOC = "K26" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;
 NET "O_VGA_V_SYNCn" LOC = "K25" | IOSTANDARD = LVTTL | DRIVE = 8 | SLEW = FAST ;

diff --git a/galaxian/src/mc_top.v b/galaxian/src/mc_top.v
index a8d2ca8ef76f65064ff0b0730e6ac082d4bcbd3d..c382b640ee6ffd53a20bce5f67cb8093cd51cac8 100644 (file)
--- a/galaxian/src/mc_top.v
+++ b/galaxian/src/mc_top.v
@@ -95,9 +95,9 @@ output  O_SOUND_OUT_L;
 output  O_SOUND_OUT_R;\r
 \r
 //    VGA (VIDEO) IF\r
-output [4:0]O_VGA_R;\r
-output [4:0]O_VGA_G;\r
-output [4:0]O_VGA_B;\r
+output [2:0]O_VGA_R;\r
+output [2:0]O_VGA_G;\r
+output [1:0]O_VGA_B;\r
 output O_VGA_H_SYNCn;\r
 output O_VGA_V_SYNCn;\r
 \r
@@ -643,11 +643,11 @@ mc_vga_if  VGA(
 \r
 `else\r
 \r
-assign O_VGA_R[4:0] = W_R;\r
+assign O_VGA_R[2:0] = W_R;\r
 \r
-assign O_VGA_G[4:0] = W_G;\r
+assign O_VGA_G[2:0] = W_G;\r
 \r
-assign O_VGA_B[4:0] = W_B;\r
+assign O_VGA_B[1:0] = W_B;\r
 \r
 //assign O_VGA_H_SYNCn = W_H_SYNC | W_V_SYNC ;  //  AKIDUKI LCD USED\r
 assign O_VGA_H_SYNCn = ~W_H_SYNC ;\r

diff --git a/galaxian/src/mc_vga_if.v b/galaxian/src/mc_vga_if.v
index 707e8a1e6d7d4b05ba458bab4af79b887c0a76f8..4883686c3f13165446bdc20e269213779c52cbde 100644 (file)
--- a/galaxian/src/mc_vga_if.v
+++ b/galaxian/src/mc_vga_if.v
@@ -45,9 +45,9 @@ input I_H_SYNC;        // HSYNC input (16KHz)
 input I_V_SYNC;        // VSYNC input (60Hz)\r
 \r
 // output signals\r
-output [4:0]O_R;       // R out\r
-output [4:0]O_G;       // G out\r
-output [4:0]O_B;       // B out\r
+output [2:0]O_R;       // R out\r
+output [2:0]O_G;       // G out\r
+output [1:0]O_B;       // B out\r
 output O_H_SYNCn;      // HSYNC output\r
 output O_V_SYNCn;      // VSYNC output\r
 \r
@@ -174,9 +174,9 @@ end
 // output\r
 //---------------------------------------------------------------------------\r
 \r
-assign O_R = {2'b00,rgb_out[7:5]}; \r
-assign O_G = {2'b00,rgb_out[4:2]};\r
-assign O_B = {3'b000,rgb_out[1:0]}; \r
+assign O_R = rgb_out[7:5]; \r
+assign O_G = rgb_out[4:2];\r
+assign O_B = rgb_out[1:0]; \r
 \r
 // converted  H V SYNC\r
 assign O_H_SYNCn = ~O_Hsync;\r