X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Flib%2FMemoryMap.bsv;h=9281366440bcc2d40cb3997be85864561fe8bc5a;hb=HEAD;hp=9d07c0987e52d38922436fd8442f22ad3cb5f287;hpb=ad6ed4944387f23342419b978dec5b9fbd32839d;p=shakti-core.git

diff --git a/src/lib/MemoryMap.bsv b/src/lib/MemoryMap.bsv
index 9d07c09..9281366 100644
--- a/src/lib/MemoryMap.bsv
+++ b/src/lib/MemoryMap.bsv
@@ -31,21 +31,23 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package MemoryMap;
 	/*=== Project imports ==== */
 	import defined_types::*;
-	import socgen::*;
-	import slow_peripherals::*;
+	import fast_memory_map::*;
+	import slow_memory_map::*;
+	`include "slow_instance_defines.bsv"
+	`include "fast_instance_defines.bsv"
 	`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 = fn_addr_to_fastslave_num(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 = fn_slow_address_mapping(addr);
     Bool isslow = tpl_1(st);
     Bit#(TLog#(Num_Slow_Slaves)) y = tpl_2(st);
     if (isfast)
@@ -60,11 +62,13 @@ endfunction
 function Bool is_IO_Addr(Bit#(`PADDR) addr); // TODO Shuold be PADDR
         if(addr>=`DebugBase && addr<=`DebugEnd)
             return (True);
-        else if(addr>=`SDRAMMemBase && addr<=`SDRAMMemEnd)
-        `ifdef FlexBus
+        `ifdef SDR0MemBase
+            else if(addr>=`SDR0MemBase && addr<=`SDR0MemEnd)
+            `ifdef FlexBus
                 return (True);
-        `else
-            return (False);
+            `else
+                return (False);
+            `endif
         `endif
         `ifdef BOOTROM
             else if(addr>=`BootRomBase && addr<=`BootRomEnd)