jens/vhdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- removed INT_O_TX from UART. Use now common INT_O for RX/TX

Browse Source 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/


git-svn-id: http://moon:8086/svn/vhdl/trunk@469 cc03376c-175c-47c8-b038-4cd826a8556b
This commit is contained in:
jens
2009-05-03 09:30:58 +00:00
parent 134119db33
commit 1c17d74ae1
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/uart/uart_wb.vhd
+2 -4
View File
@@ -17,8 +17,7 @@ ENTITY uart_wb IS
ADDR_I : in unsigned(31 downto 0); ADDR_I : in unsigned(31 downto 0);
DAT_I : in unsigned(31 downto 0); DAT_I : in unsigned(31 downto 0);
DAT_O : out unsigned(31 downto 0); DAT_O : out unsigned(31 downto 0);
INT_RX_O : out STD_LOGIC; INT_O : out STD_LOGIC;
INT_TX_O : out STD_LOGIC;
ser_rx : in std_logic; ser_rx : in std_logic;
ser_tx : out std_logic ser_tx : out std_logic
); );
@@ -177,7 +176,6 @@ inst_uart_rx: uart_rx
); );
uart_status_port <= '0' & rx_int_en & tx_int_en & rx_data_present & rx_full & rx_half_full & tx_full & tx_half_full; uart_status_port <= '0' & rx_int_en & tx_int_en & rx_data_present & rx_full & rx_half_full & tx_full & tx_half_full;
INT_RX_O <= rx_data_present and rx_int_en; INT_O <= (rx_data_present and rx_int_en) or (not tx_full and tx_int_en);
INT_TX_O <= not tx_full and tx_int_en;
end behavior; end behavior;
projects/mips_sys/src/mips_sys.vhd
+11 -6
View File
@@ -222,8 +222,7 @@ ARCHITECTURE behavior OF mips_sys IS
ADDR_I : in unsigned(31 downto 0); ADDR_I : in unsigned(31 downto 0);
DAT_I : in unsigned(31 downto 0); DAT_I : in unsigned(31 downto 0);
DAT_O : out unsigned(31 downto 0); DAT_O : out unsigned(31 downto 0);
INT_RX_O : out STD_LOGIC; INT_O : out STD_LOGIC;
INT_TX_O : out STD_LOGIC;
ser_rx : in std_logic; ser_rx : in std_logic;
ser_tx : out std_logic ser_tx : out std_logic
); );
@@ -311,7 +310,7 @@ ARCHITECTURE behavior OF mips_sys IS
signal clk270var : std_logic; signal clk270var : std_logic;
signal rst_in : std_logic; signal rst_in : std_logic;
signal int_timer : std_logic; signal int_timer : std_logic;
signal int_uart_rx : std_logic; signal int_uart : std_logic;
signal locked : std_logic; signal locked : std_logic;
signal usb_addr : unsigned(31 downto 0); signal usb_addr : unsigned(31 downto 0);
signal flash_addr : unsigned(31 downto 0); signal flash_addr : unsigned(31 downto 0);
@@ -425,6 +424,13 @@ ARCHITECTURE behavior OF mips_sys IS
BEGIN BEGIN
------------------------------------
-- GPO1 bits used for
-- 0 : USB reset
-- 1 : USB interrupt enable
-- 2 : AC97 interrupt enable
-- others : reserved
------------------------------------
eb <= sys_dip(7); eb <= sys_dip(7);
gpi0(4 downto 0) <= sys_btn; gpi0(4 downto 0) <= sys_btn;
gpi1(7 downto 0) <= sys_dip; gpi1(7 downto 0) <= sys_dip;
@@ -485,7 +491,7 @@ int_sample:
process(clk) process(clk)
begin begin
if rising_edge(clk) then if rising_edge(clk) then
INT <= int_timer & '0' & INT_O_ac97 & sys_usb_int & int_uart_rx & sys_btn(4); INT <= int_timer & '0' & (gpo1(2) and INT_O_ac97) & (gpo1(1) and sys_usb_int) & int_uart & sys_btn(4);
end if; end if;
end process; end process;
@@ -726,8 +732,7 @@ inst_uart_wb : uart_wb
ADDR_I => ADDR_O, ADDR_I => ADDR_O,
DAT_I => MDAT_O, DAT_I => MDAT_O,
DAT_O => SDAT_O_uart, DAT_O => SDAT_O_uart,
INT_RX_O => int_uart_rx, INT_O => int_uart,
INT_TX_O => open,
ser_rx => sys_rx, ser_rx => sys_rx,
ser_tx => sys_tx ser_tx => sys_tx
); );
projects/mips_sys/src/mips_sys_sim.vhd
+4 -6
View File
@@ -266,8 +266,7 @@ ARCHITECTURE behavior OF mips_sys IS
ADDR_I : in unsigned(31 downto 0); ADDR_I : in unsigned(31 downto 0);
DAT_I : in unsigned(31 downto 0); DAT_I : in unsigned(31 downto 0);
DAT_O : out unsigned(31 downto 0); DAT_O : out unsigned(31 downto 0);
INT_RX_O : out STD_LOGIC; INT_O : out STD_LOGIC;
INT_TX_O : out STD_LOGIC;
ser_rx : in std_logic; ser_rx : in std_logic;
ser_tx : out std_logic ser_tx : out std_logic
); );
@@ -355,7 +354,7 @@ ARCHITECTURE behavior OF mips_sys IS
signal clk270var : std_logic; signal clk270var : std_logic;
signal rst_in : std_logic; signal rst_in : std_logic;
signal int_timer : std_logic; signal int_timer : std_logic;
signal int_uart_rx : std_logic; signal int_uart : std_logic;
signal locked : std_logic; signal locked : std_logic;
signal ac97_rstn : std_logic; signal ac97_rstn : std_logic;
signal flash_rstn : std_logic; signal flash_rstn : std_logic;
@@ -575,7 +574,7 @@ int_sample:
process(clk) process(clk)
begin begin
if rising_edge(clk) then if rising_edge(clk) then
INT <= int_timer & '0' & INT_O_ac97 & sys_usb_int & int_uart_rx & sys_btn(4); INT <= int_timer & '0' & INT_O_ac97 & sys_usb_int & int_uart & sys_btn(4);
end if; end if;
end process; end process;
@@ -825,8 +824,7 @@ inst_uart_wb : uart_wb
ADDR_I => ADDR_O, ADDR_I => ADDR_O,
DAT_I => MDAT_O, DAT_I => MDAT_O,
DAT_O => SDAT_O_uart, DAT_O => SDAT_O_uart,
INT_RX_O => int_uart_rx, INT_O => int_uart,
INT_TX_O => open,
ser_rx => sys_rx, ser_rx => sys_rx,
ser_tx => sys_tx ser_tx => sys_tx
); );