From: Pavel Pisa <ppisa@pikron.com>
Date: Sat, 21 Feb 2015 22:10:58 +0000 (+0100)
Subject: IRC inputs: fix problem when index is reported to MCU before value update.
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/fpga/lx-cpu1/lx-rocon.git/commitdiff_plain/e2ca8463c044cb9ea8876c26fc5a99523ee054fe?ds=sidebyside

IRC inputs: fix problem when index is reported to MCU before value update.

Signed-off-by: Pavel Pisa <ppisa@pikron.com>
---

diff --git a/hw/qcounter.vhd b/hw/qcounter.vhd
index 6dca87c..4ef4ded 100644
--- a/hw/qcounter.vhd
+++ b/hw/qcounter.vhd
@@ -153,23 +153,13 @@ seq:
 				index_event_v     := '1';
 			end if;
 			--
-			if reset_index_event_i = '1' then
-				index_event_int_s <= '0';
-			else
-				index_event_int_s <= index_event_int_s or index_event_v;
-			end if;
+			index_event_int_s <= (index_event_int_s and not reset_index_event_i) or
+			                     index_event_v;
 			--
-			if reset_index_event2_i = '1' then
-				index_event2_int_s <= '0';
-			else
-				index_event2_int_s <= index_event2_int_s or index_event_v;
-			end if;
+			index_event2_int_s <= (index_event2_int_s and not reset_index_event2_i) or
+			                      reset_index_event_i;
 			--
-			if reset_ab_error_i = '1' then
-				ab_error_int_s    <= '0';
-			else
-				ab_error_int_s    <= ab_error_int_s or ab_error_s;
-			end if;
+			ab_error_int_s    <= (ab_error_int_s and not reset_ab_error_i) or ab_error_s;
 			--
 			count_prev_s        <= count_s;
 			index_prev_s        <= index_s;