use Num_Fast_Slaves define

[shakti-core.git] / src / lib / MemoryMap.bsv

diff --git a/src/lib/MemoryMap.bsv b/src/lib/MemoryMap.bsv
index a4fbfda4e724bfea62982bf161134da5e515b8a4..16d97695c89682aa9736637a9a77046a19db962c 100644 (file)
--- a/src/lib/MemoryMap.bsv
+++ b/src/lib/MemoryMap.bsv
@@ -31,21 +31,21 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package MemoryMap;
        /*=== Project imports ==== */
        import defined_types::*;
-       import soc::*;
-       import slow_peripherals::*;
+       import fast_memory_map::*;
+       import slow_memory_map::*;
        `include "instance_defines.bsv"
        `include "core_parameters.bsv"
        /*========================= */
 
 
-function Tuple2 #(Bool, Bit#(TLog#(Num_Slaves)))
+function Tuple2 #(Bool, Bit#(TLog#(Num_Fast_Slaves)))
                     fn_addr_to_slave_num  (Bit#(`PADDR) addr);
 
-    let ft = FastTuple2;
+    let ft = FastTuple2(addr);
     Bool isfast = tpl_1(ft);
-    Bit#(TLog#(Num_Slaves)) x = tpl_2(ft);
+    Bit#(TLog#(Num_Fast_Slaves)) x = tpl_2(ft);
 
-    let st = SlowTuple2;
+    let st = SlowTuple2(addr);
     Bool isslow = tpl_1(st);
     Bit#(TLog#(Num_Slow_Slaves)) y = tpl_2(st);
     if (isfast)