comments

git-svn-id: http://svn.ohwr.org/cern-fip/trunk/hdl/design@119 7f0067c9-7624-46c7-bd39-3fb5400c0213

comments
git-svn-id: http://svn.ohwr.org/cern-fip/trunk/hdl/design@119 7f0067c9-7624-46c7-bd39-3fb5400c0213
2e4bdf05 · egousiou · 51ee65ea · 2e4bdf05 · 2e4bdf05 · 2e4bdf05
Commit 2e4bdf05 authored Jan 21, 2011 by egousiou
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

nanofip.vhd nanofip.vhd +3 -3

wf_reset_unit.vhd wf_reset_unit.vhd +2 -0

wf_wb_controller.vhd wf_wb_controller.vhd +2 -2

No files found.
--- a/nanofip.vhd
+++ b/nanofip.vhd
@@ -131,7 +131,7 @@ use work.WF_PACKAGE.all;      --! definitions of types, constants, entities
 --!                |             |   |___________| |____________|   |             |
 --!                |  WF_model_  |                                  |             |
 --!                | constr_dec  |    ___________________________   |             |
--!                |             |   |     WF_wb_controller      |  |             |
+--!                |             |   |      WF_wb_controller     |  |             |
 --!                |_____________|   |___________________________|  |_____________|
 --!                                    
 --!                                Figure 3: nanoFIP block diagram
@@ -589,9 +589,9 @@ begin


 ---------------------------------------------------------------------------------------------------
--                                      WF_wb_controller                                      --
+--                                      WF_wb_controller                                         --
 ---------------------------------------------------------------------------------------------------
-  WISHBONE_ack_generator: WF_wb_controller
+  WISHBONE_controller: WF_wb_controller
  port map (
    wb_clk_i          => wclk_i,
    wb_rst_i          => rst_i,

--- a/wf_reset_unit.vhd
+++ b/wf_reset_unit.vhd
@@ -379,6 +379,8 @@ RSTIN_free_counter: WF_incr_counter
  s_counter_is_ten   <= '1' when s_c = to_unsigned(10, s_c'length) else '0'; 
  s_counter_is_full  <= s_counter_full;
  
+
+
 ---------------------------------------------------------------------------------------------------
 --                                              var_rst                                          --
 ---------------------------------------------------------------------------------------------------

--- a/wf_wb_controller.vhd
+++ b/wf_wb_controller.vhd
@@ -121,7 +121,7 @@ begin
                                                           (wb_adr_id_i = "010")     and
                                                           (wb_we_i = '1')           and 
                                                           (wb_cyc_i = '1'))
-                                          else '0';
+                                            else '0';

 --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  --  -- 
 --!@brief Generate_wb_ack_read_p:  Generation of the wb_ack_read_p signal
@@ -130,7 +130,7 @@ begin
 --! corresponds to an address in the Consumed memory block.

  Generate_wb_ack_read_p_o: s_wb_ack_read_p <= '1' when ((wb_stb_r_edge_p_i = '1')        and 
-                                                         (wb_adr_id_i(1 downto 0) = "00") and
+                                                         (wb_adr_id_i(2 downto 1) = "00") and
                                                         (wb_cyc_i = '1'))
                                          else '0';