spartan3e: init fix fuer display und dem vga-ipcore

diff --git a/src/display.vhd b/src/display.vhd
index ad5ac66c2a2d8d43988a32b599a50453dde14f36..0f5afef2e6d8e7d32b9166dea604e077d1229ad2 100644 (file)
--- a/src/display.vhd
+++ b/src/display.vhd
@@ -27,10 +27,10 @@ entity display is
 end entity display;
 
 architecture beh of display is
-       type DISPLAY_STATE is (SIDLE, S_NEW_BS, S_BACK, S_BLANK, S_NEW_RESULT,
+       type DISPLAY_STATE is (S_INIT, SIDLE, S_NEW_BS, S_BACK, S_BLANK, S_NEW_RESULT,
                S_ZEILEUP, S_NEW_INPUT, S_COUNTUP, S_GETCH, S_CR1, S_NL1, S_PUTCH1,
                S_PUTCH2, S_WAIT, S_NOP1, S_READ_RESULT_0, S_READ_RESULT_1,
-               S_READ_RESULT_2, S_INIT, S_PS1_0, S_PS1_1, S_PS1_2, S_PS1_3, S_PS1_4,
+               S_READ_RESULT_2, S_PS1_0, S_PS1_1, S_PS1_2, S_PS1_3, S_PS1_4,
                S_PS1_5);
        type DISPLAY_ISTATE is (IS_BACK_2_BLANK, IS_BLANK_2_BACK,
                IS_NL1_2_ZEILEUP, IS_RESULT2_2_CR1, IS_CR1_2_NL1, IS_NL1_2_RESULT0,

diff --git a/src/textmode_vga/textmode_vga_pkg.vhd b/src/textmode_vga/textmode_vga_pkg.vhd
index 7646bad0fd74e9d55a0b40949b1d3928fd9a0efa..27b55c8e7791719b52d64cc7dc0d6a5cc98b767b 100644 (file)
--- a/src/textmode_vga/textmode_vga_pkg.vhd
+++ b/src/textmode_vga/textmode_vga_pkg.vhd
@@ -73,6 +73,6 @@ package textmode_vga_pkg is
   constant CHAR_CARRIAGE_RETURN : std_logic_vector(CHAR_SIZE - 1 downto 0) := x"0D";\r
   constant CHAR_NULL : std_logic_vector(CHAR_SIZE - 1 downto 0) := x"00";\r
   \r
-  type CURSOR_STATE_TYPE is (CURSOR_OFF, CURSOR_ON, CURSOR_BLINK);\r
+  type CURSOR_STATE_TYPE is (CURSOR_BLINK, CURSOR_OFF, CURSOR_ON);\r
   constant CURSOR_BLINK_INTERVAL_MS : integer := 500;\r
 end package textmode_vga_pkg;\r