projects
/
hwmod.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allgemein: konstanten verwenden
[hwmod.git]
/
src
/
pc_communication.vhd
diff --git
a/src/pc_communication.vhd
b/src/pc_communication.vhd
index bb15b065194f9e32f24de8d848af9baa674229f8..b593b33a1a01f318a953bc33863fe0bc29c4f51b 100644
(file)
--- a/
src/pc_communication.vhd
+++ b/
src/pc_communication.vhd
@@
-21,17
+21,18
@@
entity pc_communication is
rx_new : in std_logic;
-- History
rx_new : in std_logic;
-- History
- d_zeile : out hzeile;
- d_spalte : out hspalte;
- d_get : out std_logic;
- d_done : in std_logic;
- d_char : in hbyte
+ pc_zeile : out hzeile;
+ pc_spalte : out hspalte;
+ pc_get : out std_logic;
+ pc_busy : in std_logic; --signals if the history module actually grants our request.
+ pc_done : in std_logic;
+ pc_char : in hbyte
);
end entity pc_communication;
architecture beh of pc_communication is
);
end entity pc_communication;
architecture beh of pc_communication is
- signal spalte, spalte_next : integer range 1 to
hspalte_max
+ 1;
- signal zeile , zeile_next : integer range 1 to
hzeile_max
+ 1;
+ signal spalte, spalte_next : integer range 1 to
HSPALTE_MAX
+ 1;
+ signal zeile , zeile_next : integer range 1 to
HZEILE_MAX
+ 1;
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 get, get_next : std_logic;
signal new_i, new_i_next : std_logic;
signal tx_done_i, tx_done_i_next : std_logic;
@@
-43,9
+44,9
@@
architecture beh of pc_communication is
begin
begin
-
d
_zeile <= hzeile(std_logic_vector(to_unsigned(zeile,7)));
-
d
_spalte <= hspalte(std_logic_vector(to_unsigned(spalte,7)));
-
d
_get <= get;
+
pc
_zeile <= hzeile(std_logic_vector(to_unsigned(zeile,7)));
+
pc
_spalte <= hspalte(std_logic_vector(to_unsigned(spalte,7)));
+
pc
_get <= get;
tx_new <= new_i;
tx_done_i_next <= tx_done;
tx_data <= tx_data_i;
tx_new <= new_i;
tx_done_i_next <= tx_done;
tx_data <= tx_data_i;
@@
-71,7
+72,7
@@
begin
end if;
end process sync;
end if;
end process sync;
- output_pc : process (state, zeile, spalte, tx_data_i, tx_done_i,
d
_char)
+ output_pc : process (state, zeile, spalte, tx_data_i, tx_done_i,
pc
_char)
begin
get_next <= '0';
new_i_next <= '0';
begin
get_next <= '0';
new_i_next <= '0';
@@
-86,16
+87,17
@@
begin
when FETCH =>
get_next <= '1';
when WAIT_HIST =>
when FETCH =>
get_next <= '1';
when WAIT_HIST =>
- tx_data_i_next <=
d
_char;
+ tx_data_i_next <=
pc
_char;
when FORWARD =>
new_i_next <= '1';
when WAIT_UART =>
when FORWARD =>
new_i_next <= '1';
when WAIT_UART =>
- n
ull
;
+ n
ew_i_next <= '1'
;
when UART_DONE =>
when UART_DONE =>
- if tx_data_i = x"00" or spalte = hspalte_max then
+ if tx_data_i = x"00" or spalte = HSPALTE_MAX then
+ tx_data_i_next <= x"0a";
zeile_next <= zeile + 1;
spalte_next <= 1;
zeile_next <= zeile + 1;
spalte_next <= 1;
- if zeile =
hzeile_max
then
+ if zeile =
HZEILE_MAX
then
zeile_next <= 1;
end if;
else
zeile_next <= 1;
end if;
else
@@
-104,18
+106,24
@@
begin
end case;
end process output_pc;
end case;
end process output_pc;
- next_state_pc : process (btn_a, d_done, rx_new, rx_data, spalte, state, tx_data_i ,tx_done_i, zeile)
+ next_state_pc : process (btn_a, pc_busy, pc_done, rx_new, rx_data, spalte,
+ state, tx_data_i ,tx_done_i, zeile)
begin
state_next <= state;
case state is
when IDLE =>
begin
state_next <= state;
case state is
when IDLE =>
- if (rx_new = '1' and rx_data = x"0a" ) or btn_a = '1' then
+-- if (rx_new = '1' and rx_data = x"0a") or btn_a = '0' then
+ if (rx_new = '1') or btn_a = '0' then
state_next <= FETCH;
end if;
when FETCH =>
state_next <= FETCH;
end if;
when FETCH =>
- state_next <= WAIT_HIST;
+ if pc_busy = '1' then
+ state_next <= WAIT_HIST;
+ else
+ state_next <= FETCH;
+ end if;
when WAIT_HIST =>
when WAIT_HIST =>
- if (
d
_done = '1') then
+ if (
pc
_done = '1') then
state_next <= FORWARD;
end if;
when FORWARD =>
state_next <= FORWARD;
end if;
when FORWARD =>
@@
-125,8
+133,8
@@
begin
state_next <= UART_DONE;
end if;
when UART_DONE =>
state_next <= UART_DONE;
end if;
when UART_DONE =>
- if (tx_data_i = x"00" or spalte =
hspalte_max
) and
- zeile =
hzeile_max
then
+ if (tx_data_i = x"00" or spalte =
HSPALTE_MAX
) and
+ zeile =
HZEILE_MAX
then
state_next <= IDLE;
else
state_next <= FETCH;
state_next <= IDLE;
else
state_next <= FETCH;