fixed processes to be never rerunning an use loops instead, this makes the code less...

diff --git a/src/beh_pc_communication_tb.vhd b/src/beh_pc_communication_tb.vhd
index 1ed8b7585a490225ee86ae6e704711975191a9d2..0775e5e28f8915c8a4b8286f23beaa7cc8663ae1 100644 (file)
--- a/src/beh_pc_communication_tb.vhd
+++ b/src/beh_pc_communication_tb.vhd
@@ -14,6 +14,7 @@ end entity beh_pc_communication_tb;
 
 architecture sim of beh_pc_communication_tb is
                type byte_file_type is file of hbyte;
+               subtype my_string is string(1 to 720);
                signal sys_clk : std_logic;
                signal sys_res_n : std_logic;
                signal btn_a : std_logic;
@@ -63,27 +64,49 @@ begin
        end process clk;
 
        stub_history : process
-               file f : byte_file_type open read_mode is "../../src/pc_communication.test";
-               variable rb : hbyte;
+               file f : text open read_mode is "../../src/pc_communication.test";
+               --variable rb : hbyte;
+               variable rb : character;
+               variable good : boolean;
+               variable i : integer;
+               variable buf : my_string;
+               variable l : line;
        begin
-               d_done <= '0';
-               wait until rising_edge(d_get);
+               --take control of the situation.
+               d_char <= (others => '0');
+               wait until sys_res_n = '1';
+
+               while not endfile (f) loop
+                       readline(f, l);
+                       i := 1;
+                       while i < l'length loop
+                               wait until rising_edge(d_get);
+                               d_done <= '0';
+                               d_char <= (others => '0');
+                               wait for 90 ns;
+
+                               d_char <= hbyte(std_logic_vector(to_unsigned(character'pos(buf(i)),8)));
+                               d_done <= '1';
+                               wait for 30 ns;
+                               
+                       end loop;
+               end loop;
+
                assert not endfile(f) report "test beendet" severity failure;
-               read(f, rb);
-               wait for 30 ns;
-               d_char <= rb;
-               d_done <= '1';
-               wait for 30 ns;
        end process stub_history;
 
-
        stub_uart : process
        begin
                tx_done <= '0';
-               wait until rising_edge(tx_new);
-               wait for 90 ns;
-               tx_done <= '1'; -- FIXME: why is this unresolved?
-               wait for 30 ns;
+               while true loop
+                       wait until sys_res_n = '1';
+
+                       wait until rising_edge(tx_new);
+                       tx_done <= '0';
+                       wait for 300 ns;
+                       tx_done <= '1';
+                       wait for 30 ns;
+               end loop;
        end process stub_uart;
 
        reset_and_button : process
@@ -92,13 +115,11 @@ begin
                -- we only simulate pressing of button a by now!
                sys_res_n <= '0';
                btn_a <= '0';
-               tx_data <= "00000000";
-               rx_data <= "00000000";
-               d_zeile <= "0000000";
-               d_spalte <= "0000000";
-               tx_done <= '0';
+               tx_data <= ( others => '0');
+               rx_data <= ( others => '0');
+               d_zeile <= ( others => '0');
+               d_spalte <= ( others => '0');
                rx_new <= '0';
-               d_char <= (others => '0');
                
                wait for 90 ns;
                sys_res_n <= '1';
@@ -106,9 +127,9 @@ begin
                btn_a <= '1';
                wait for 15 ns;
                btn_a <= '0';
-               --wait;
-               wait for 1000 ns;
-               assert false report "test beendet" severity failure;
+               wait;
+               --wait for 1000 ns;
+               --assert false report "test beendet" severity failure;
        end process reset_and_button;
 
 end architecture sim;

diff --git a/src/pc_communication.vhd b/src/pc_communication.vhd
index 4bc09d4c9bd319f745f6a40bd5e9df4071099a93..06884f00a28e858ad72b76972c9e7b63ecd50c21 100644 (file)
--- a/src/pc_communication.vhd
+++ b/src/pc_communication.vhd
@@ -38,7 +38,7 @@ architecture beh of pc_communication is
        signal get, get_next : std_logic;
        signal new_i, new_i_next : std_logic;
        signal tx_done_i, tx_done_i_next : std_logic;
-       signal d_done_i, d_done_i_next : std_logic;
+       signal d_done_i : std_logic;
 
        signal char, char_next : hbyte;
        signal char_en : std_logic;
@@ -54,7 +54,7 @@ begin
        char_next <= d_char;
        tx_new <= new_i;
        d_done_i <= d_done;
-       tx_done_i <= tx_done;
+       tx_done_i_next <= tx_done;
 
        sync: process (sys_clk, sys_res_n)
        begin
@@ -67,6 +67,7 @@ begin
                        new_i <= '0';
                        tx_data <= "00000000";
                        spalte_up <= '0';
+                       tx_done_i <= '0';
                elsif rising_edge(sys_clk) then
                        push_history <= push_history_next;
                        spalte <= spalte_next;
@@ -74,6 +75,7 @@ begin
                        state <= state_next;
                        get <= get_next;
                        new_i <= new_i_next;
+                       tx_done_i <= tx_done_i_next;
                        spalte_up <= spalte_up_next;
                        if (char_en = '1') then
                                char <= char_next;
@@ -112,7 +114,7 @@ begin
                end if;
        end process async_push_history;
 
-       output_pc : process (state, zeile, spalte, char)
+       output_pc : process (state, zeile, spalte, char, tx_done_i)
        begin
                get_next <= '0';
                new_i_next <= '0';
@@ -127,7 +129,7 @@ begin
                                char_en <= '0';
                                tx_data <= char;
                                new_i_next <= '1';
-                               if (tx_done = '1') then
+                               if (tx_done_i = '1') then
                                        spalte_up_next <= '1';
                                end if;
                        when DONE =>
@@ -135,7 +137,7 @@ begin
                end case;
        end process output_pc;
 
-       next_state_pc : process (rx_new, btn_a, d_done, tx_done)
+       next_state_pc : process (rx_new, btn_a, d_done, tx_done_i)
        begin
                case state is
                        when IDLE =>
@@ -148,7 +150,7 @@ begin
                                        state_next <= FORWARD;
                                end if;
                        when FORWARD =>
-                               if (tx_done = '1') then
+                               if (tx_done_i = '1') then
                                        state_next <= FETCH;
                                end if;
                        when DONE =>