From 576357a4d4fe0a5891d2898cc9478cdfcb5de29a Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Mon, 9 Nov 2009 20:30:32 +0000 Subject: [PATCH] - removed btn-east for hard-reset 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@653 cc03376c-175c-47c8-b038-4cd826a8556b --- projects/mips_sys/src/mips_sys.vhd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/mips_sys/src/mips_sys.vhd b/projects/mips_sys/src/mips_sys.vhd index bb62c78..d9a5ce3 100644 --- a/projects/mips_sys/src/mips_sys.vhd +++ b/projects/mips_sys/src/mips_sys.vhd @@ -333,7 +333,7 @@ ARCHITECTURE behavior OF mips_sys IS signal int_uart1 : std_logic; signal uart1_tx : std_logic; signal uart1_rx : std_logic; - signal usb_addr : unsigned(31 downto 0); + signal usb_addr : unsigned(3 downto 0); signal ac97_rstn : std_logic; signal mem_mapped_io : std_logic; signal flash_rstn : std_logic; @@ -491,10 +491,10 @@ BEGIN sys_led <= gpo0(8 downto 0); sys_error <= debug; nmi <= not sys_rst_n_in; - rst_in <= not sys_rst_n_in and sys_btn(0) and sys_btn(2); + rst_in <= not sys_rst_n_in and sys_btn(0); sys_usb_rstn <= not gpo1(0); sys_flash_byten <= '1'; - usb_addr <= X"0000000" & "00" & ADDR_O(3 downto 2); + sys_usb_a <= usb_Addr(3 downto 2); sys_flash_a <= '0' & flash_addr(24 downto 2) & '0'; flash_page_mode_en <= not mem_mapped_io; @@ -778,7 +778,7 @@ inst_flash_port : async_port_wb inst_usb_port : async_port_wb GENERIC MAP ( - addr_width => 2, + addr_width => 4, data_width => 16, byte_sel_width => 1, async_timespec => ts_usb @@ -794,11 +794,11 @@ inst_usb_port : async_port_wb SRDY_O => SRDY_O_usb, MRDY_I => MRDY_O, SEL_I => SEL_O, - ADDR_I => usb_addr, + ADDR_I => ADDR_O, DAT_I => MDAT_O, DAT_O => SDAT_O_usb, page_mode_en => '0', - async_a => sys_usb_a, + async_a => usb_addr, async_d => sys_usb_d, async_cs => sys_usb_csn, async_wr => sys_usb_wrn,