From c8561cc155ae25720f6ac7e09100ffbd35dc707e Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 28 Jul 2018 06:18:41 +0100 Subject: [PATCH] fix fast/slow Tuple2 fn names --- src/bsv/bsv_lib/fast_tuple2_template.bsv | 4 ++-- src/bsv/bsv_lib/slow_tuple2_template.bsv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bsv/bsv_lib/fast_tuple2_template.bsv b/src/bsv/bsv_lib/fast_tuple2_template.bsv index 6d50157..82357cf 100644 --- a/src/bsv/bsv_lib/fast_tuple2_template.bsv +++ b/src/bsv/bsv_lib/fast_tuple2_template.bsv @@ -44,8 +44,8 @@ package fast_memory_map; -function FastTuple2 #(Bool, Bit#(TLog#(Num_Fast_Slaves))) - fn_addr_to_slave_num (Bit#(`PADDR) addr); +function Tuple2 #(Bool, Bit#(TLog#(Num_Fast_Slaves))) + fn_addr_to_fastslave_num (Bit#(`PADDR) addr); if(addr>=`SDRAMMemBase && addr<=`SDRAMMemEnd) return tuple2(True,fromInteger(valueOf(Sdram_slave_num))); diff --git a/src/bsv/bsv_lib/slow_tuple2_template.bsv b/src/bsv/bsv_lib/slow_tuple2_template.bsv index a3d92c4..ce5989b 100644 --- a/src/bsv/bsv_lib/slow_tuple2_template.bsv +++ b/src/bsv/bsv_lib/slow_tuple2_template.bsv @@ -10,8 +10,8 @@ package slow_memory_map; /* ==== define the number of slow peripheral irqs ==== */ - function SlowTuple2#(Bool, Bit#(TLog#(Num_Slow_Slaves))) - fn_address_mapping (Bit#(`ADDR) addr); + function Tuple2#(Bool, Bit#(TLog#(Num_Slow_Slaves))) + fn_slow_address_mapping (Bit#(`ADDR) addr); `ifdef CLINT if(addr>=`ClintBase && addr<=`ClintEnd) return tuple2(True,fromInteger(valueOf(CLINT_slave_num))); -- 2.30.2