ym3438: fix busy flag read

nukeykt · Aug 3, 2023 · 17fd7e9 · 17fd7e9
1 parent be77739
commit 17fd7e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/fc1004.v b/fc1004.v
@@ -215,6 +215,7 @@ module fc1004
 	wire fm_clk;
 	wire [7:0] fm_data_o;
 	wire fm_data_d;
+	wire fm_data_d2;
 	wire fm_test_d; // reg_2c[7]
 	wire fm_cs;
 	wire fm_irq;
@@ -554,12 +555,14 @@ module fc1004
 
 	wire colorbus = ~(tmss_test_1 & tmss_test_2 & tmss_test_3);
 
+	assign fm_data_d2 = fm_data_d | tmss_test_3;
+
 	assign ZD_o =
 		(ioc_bc4 ? 8'h0 : ioc_zdata) |
 		(colorbus ? 8'h0 : vdp_ra) |
-		(fm_data_d ? 8'h0 : fm_data_o);
+		(fm_data_d2 ? 8'h0 : fm_data_o);
 
-	assign ZD_d = (ioc_bc4 & colorbus & fm_data_d) ? 8'hff : 8'h0;
+	assign ZD_d = (ioc_bc4 & colorbus & fm_data_d2) ? 8'hff : 8'h0;
 
 	wire [15:0] ioc_vdata_word = { ioc_vdata[7:1], M3 ? ioc_vdata[0] : ioc_reg_3e_q, ioc_vdata[7:0] };
 

diff --git a/ym3438_io.v b/ym3438_io.v
@@ -199,7 +199,7 @@ module ym3438_io
 		);
 
 	assign data_o =
-		(read_status ? { ~busy_state_o, 6'h0, timer_b_status_sl_out, timer_a_status_sl_out } : 8'h0) |
+		(read_status ? { ~busy_state_o, 5'h0, timer_b_status_sl_out, timer_a_status_sl_out } : 8'h0) |
 		(read_debug ? debug_data : 8'h0);
 
 	assign irq = ~(timer_a_status_sl_out | timer_b_status_sl_out);