X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=cpu%2Fsrc%2Fextension_uart_b.vhd;h=c0462cce4165ab209c309f43bbbfbd1167fd6ad1;hb=1968f329b10681b760faec9369aa893cd2af8d44;hp=66112759340f978bfaedab5dbe7e38e21697c0d9;hpb=9e8a37bd8a173779f661ded4ac91cbd9932b744b;p=calu.git

diff --git a/cpu/src/extension_uart_b.vhd b/cpu/src/extension_uart_b.vhd
index 6611275..c0462cc 100644
--- a/cpu/src/extension_uart_b.vhd
+++ b/cpu/src/extension_uart_b.vhd
@@ -1,3 +1,24 @@
+--   `Deep Thought', a softcore CPU implemented on a FPGA
+--
+--  Copyright (C) 2010 Markus Hofstaetter <markus.manrow@gmx.at>
+--  Copyright (C) 2010 Martin Perner <e0725782@student.tuwien.ac.at>
+--  Copyright (C) 2010 Stefan Rebernig <stefan.rebernig@gmail.com>
+--  Copyright (C) 2010 Manfred Schwarz <e0725898@student.tuwien.ac.at>
+--  Copyright (C) 2010 Bernhard Urban <lewurm@gmail.com>
+--
+--  This program is free software: you can redistribute it and/or modify
+--  it under the terms of the GNU General Public License as published by
+--  the Free Software Foundation, either version 3 of the License, or
+--  (at your option) any later version.
+--
+--  This program is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--  GNU General Public License for more details.
+--
+--  You should have received a copy of the GNU General Public License
+--  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
 library IEEE;
 use IEEE.std_logic_1164.all;
 use IEEE.numeric_std.all;
@@ -17,8 +38,7 @@ signal 	bd_rate : baud_rate_l;
 signal rx_data : std_logic_vector(7 downto 0);
 
 signal uart_int_nxt : std_logic;
-
-signal uart_data_read, uart_data_read_nxt : std_logic;
+signal uart_data_read_nxt : std_logic;
 
 begin
 
@@ -40,7 +60,7 @@ port map(
 	w3_uart_send(byte_t'range),
 	tx_rdy,
 	bd_rate,
-	w1_st_co(0)
+	w1_st_co(16)
 );
 
 rs232_rx_inst : rs232_rx
@@ -70,13 +90,11 @@ begin
    if (reset = RESET_VALUE) then
 			w1_st_co <= (others=>'0');
 			w2_uart_config(31 downto 16) <= (others=>'0');
-			-- todo mit einer konstante versehen
-			w2_uart_config(15 downto 0) <= x"01B2";
+			w2_uart_config(15 downto 0) <= std_logic_vector(to_unsigned(CLK_PER_BAUD, 16));
 			w3_uart_send <= (others=>'0');
 			w4_uart_receive <= (others=>'0');
 			tx_rdy_int <= '0';
 			new_tx_data <= '0';
-			uart_data_read <= '0';
 			uart_int <= '0';
 
 	elsif rising_edge(clk) then            
@@ -86,14 +104,14 @@ begin
 			w4_uart_receive <= w4_uart_receive_nxt;
 			new_tx_data <= new_tx_data_nxt;
 			tx_rdy_int <= tx_rdy;
-			uart_data_read <= uart_data_read_nxt;
 			uart_int <= uart_int_nxt;
    end if;
 end process syn;
 
 -------------------------- LESEN UND SCHREIBEN ANFANG ------------------------------------------------------------
 
-gwriten : process (ext_reg,tx_rdy,w1_st_co,w2_uart_config,w3_uart_send,w4_uart_receive,tx_rdy_int, rx_data, new_bus_rx, uart_data_read)
+gwriten : process
+	(ext_reg,tx_rdy,w1_st_co,w2_uart_config,w3_uart_send,w4_uart_receive,tx_rdy_int, rx_data, new_bus_rx, uart_data_read_nxt)
 
 variable tmp_data  : gp_register_t;
 
@@ -125,7 +143,7 @@ begin
 		when "01" =>
 			w2_uart_config_nxt <= tmp_data;
 		when "10" =>
-			w1_st_co_nxt(16) <= '1'; -- busy flag set
+			w1_st_co_nxt(0) <= '1'; -- busy flag set
 			w3_uart_send_nxt <= tmp_data;
 		when "11" =>
 			--w4_uart_receive_nxt <= tmp_data; sollte nur gelesen werden
@@ -134,17 +152,17 @@ begin
 	end if;
 
 	if  tx_rdy = '1' and tx_rdy_int = '0' then
-		w1_st_co_nxt(16) <= '0'; -- busy flag reset	
+		w1_st_co_nxt(0) <= '0'; -- busy flag reset	
 	end if;
 
 	if new_bus_rx = '1' then
 		w4_uart_receive_nxt(7 downto 0) <= rx_data;
-		w1_st_co_nxt(17) <= '1';
+		w1_st_co_nxt(1) <= '1';
 		uart_int_nxt <= '1';
 	end if;
 	
-	if (uart_data_read = '1' and w1_st_co(17) = '1' and ext_reg.sel = '1') then
-		w1_st_co_nxt(17) <= '0';
+	if (uart_data_read_nxt = '1' and w1_st_co(1) = '1' and ext_reg.sel = '1') then
+		w1_st_co_nxt(1) <= '0';
 	end if;
 	
 end process gwriten;