From dd1a74ab322b2feb6c571e68c4c643a94f73298e Mon Sep 17 00:00:00 2001
From: rs <>
Date: Thu, 11 Dec 2025 21:06:51 -0600
Subject: [PATCH] Rename ACK to RDY in merge pipeline control block

---
 libraries/dsp/merge.vhd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/dsp/merge.vhd b/libraries/dsp/merge.vhd
index 9fc6dd0..db51450 100644
--- a/libraries/dsp/merge.vhd
+++ b/libraries/dsp/merge.vhd
@@ -19,13 +19,13 @@ use unisim.vcomponents.all;
 entity merge is
 	port (
 		a_stb_i: in  std_logic;
-		a_ack_o: out std_logic;
+		a_rdy_o: out std_logic;
 
 		b_stb_i: in  std_logic;
-		b_ack_o: out std_logic;
+		b_rdy_o: out std_logic;
 
 		stb_o:   out std_logic;
-		ack_i:   in  std_logic
+		rdy_i:   in  std_logic
 	);
 end merge;
 
@@ -38,7 +38,7 @@ begin
 
 	costrobe <= a_stb_i and b_stb_i;
 	stb_o    <= costrobe;
-	a_ack_o  <= costrobe and ack_i;
-	b_ack_o  <= costrobe and ack_i;
+	a_rdy_o  <= costrobe and rdy_i;
+	b_rdy_o  <= costrobe and rdy_i;
 
 end behavioral;
-- 
2.43.0