Merge pull request #29 from MikeS11/master

Update Sys, Add Aspect Ratio
MiSTer-devel · Mar 15, 2023 · 43f7f17 · 43f7f17
2 parents 0704272 + 890f993
commit 43f7f17
Show file tree

Hide file tree

Showing 14 changed files with 322 additions and 2,440 deletions.
diff --git a/Arcade-Druaga.sv b/Arcade-Druaga.sv
@@ -181,8 +181,8 @@ assign BUTTONS = 0;
 assign USER_OUT  = '1;
 assign LED_USER  = ioctl_download;
 
-assign VIDEO_ARX = status[1] ? 8'd16 : status[2] ? 8'd4 : 8'd3;
-assign VIDEO_ARY = status[1] ? 8'd9  : status[2] ? 8'd3 : 8'd4;
+assign VIDEO_ARX = status[1] ? 8'd16 : status[2] ? 12'd289 : 12'd224;
+assign VIDEO_ARY = status[1] ? 8'd9  : status[2] ? 12'd224 : 12'd289;
 
 `include "build_id.v"
 

diff --git a/releases/Arcade-Druaga_20230313.rbf b/releases/Arcade-Druaga_20230313.rbf
diff --git a/sys/fbpal.sv b/sys/fbpal.sv
diff --git a/sys/hdmi_config.sv b/sys/hdmi_config.sv
diff --git a/sys/hps_io.sv b/sys/hps_io.sv
@@ -891,22 +891,28 @@ always @(posedge clk_sys) begin
 	  11: dout <= vid_pix[31:16];
 	  12: dout <= vid_vtime_hdmi[15:0];
 	  13: dout <= vid_vtime_hdmi[31:16];
+	  14: dout <= vid_ccnt[15:0];
+	  15: dout <= vid_ccnt[31:16];
 	  default dout <= 0;
 	endcase
 end
 
 reg [31:0] vid_hcnt = 0;
 reg [31:0] vid_vcnt = 0;
+reg [31:0] vid_ccnt = 0;
 reg  [7:0] vid_nres = 0;
 reg  [1:0] vid_int  = 0;
 
 always @(posedge clk_vid) begin
 	integer hcnt;
 	integer vcnt;
+	integer ccnt;
 	reg old_vs= 0, old_de = 0, old_vmode = 0;
 	reg [3:0] resto = 0;
 	reg calch = 0;
 
+	if(calch & de) ccnt <= ccnt + 1;
+
 	if(ce_pix) begin
 		old_vs <= vs;
 		old_de <= de;
@@ -927,9 +933,11 @@ always @(posedge clk_vid) begin
 					if(&resto) vid_nres <= vid_nres + 1'd1;
 					vid_hcnt <= hcnt;
 					vid_vcnt <= vcnt;
+					vid_ccnt <= ccnt;
 				end
 				vcnt <= 0;
 				hcnt <= 0;
+				ccnt <= 0;
 				calch <= 1;
 			end
 		end