From: Bernhard Urban <lewurm@gmail.com>
Date: Sun, 16 May 2010 19:21:49 +0000 (+0200)
Subject: display: rechtzeitig wieder COMMAND_NOP anlegen
X-Git-Tag: alpha~22
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=hwmod.git;a=commitdiff_plain;h=9bf74f508d4fe35c8c3d211d0d50c16a4560172c

display: rechtzeitig wieder COMMAND_NOP anlegen
---

diff --git a/src/beh_display_tb.vhd b/src/beh_display_tb.vhd
index e7ef5e2..707788b 100644
--- a/src/beh_display_tb.vhd
+++ b/src/beh_display_tb.vhd
@@ -91,14 +91,15 @@ begin
 			d_new_eingabe <= '0';
 
 			free <= '0';
-			icwait(sys_clk, 3);
+			icwait(sys_clk, 1);
 			free <= '1';
-			icwait(sys_clk, 3);
+			icwait(sys_clk, 1);
 
 			-- fuer NOP
 			free <= '0';
-			icwait(sys_clk, 3);
+			icwait(sys_clk, 1);
 			free <= '1';
+			icwait(sys_clk, 1);
 
 			i := i + 1;
 		end loop;
diff --git a/src/display.vhd b/src/display.vhd
index 742c792..432c07a 100644
--- a/src/display.vhd
+++ b/src/display.vhd
@@ -27,7 +27,7 @@ end entity display;
 
 architecture beh of display is
 	type DISPLAY_STATE is (SIDLE, S_NEW_RESULT, S_NEW_INPUT, S_COUNTUP, S_GETCH,
-	S_PUTCH, S_WAIT, S_NOP1, S_NOP2);
+	S_PUTCH, S_WAIT, S_NOP1);
 	signal state_int, state_next : DISPLAY_STATE;
 	signal d_zeile_int, d_zeile_next : hzeile;
 	signal d_spalte_int, d_spalte_next : hspalte;
@@ -94,10 +94,6 @@ begin
 					state_next <= S_NOP1;
 				end if;
 			when S_NOP1 =>
-				if free = '0' then
-					state_next <= S_NOP2;
-				end if;
-			when S_NOP2 =>
 				if free = '1' then
 					if unsigned(d_spalte_int) = 71 then
 						state_next <= SIDLE;
@@ -137,9 +133,7 @@ begin
 			when S_PUTCH =>
 				command_next <= COMMAND_SET_CHAR;
 				command_data_next <= x"ffffff" & std_logic_vector(d_char);
-			when S_WAIT | S_NOP2 =>
-				null;
-			when S_NOP1 =>
+			when S_WAIT | S_NOP1 =>
 				command_next <= COMMAND_NOP;
 				command_data_next <= x"00000000";
 		end case;