split out peripheral interfaces to separate classes

diff --git a/src/bsv/bsv_lib/slow_peripherals_template.bsv b/src/bsv/bsv_lib/slow_peripherals_template.bsv
index b97f257d275116692a0907d9c63e6af589016f7e..dd5d153899a5a43bacc7fe618ca5fff490f3eab1 100644 (file)
--- a/src/bsv/bsv_lib/slow_peripherals_template.bsv
+++ b/src/bsv/bsv_lib/slow_peripherals_template.bsv
@@ -57,7 +57,8 @@ package slow_peripherals;
        endinterface
        /*================================*/
 
-       function Tuple2#(Bool, Bit#(TLog#(Num_Slow_Slaves))) fn_address_mapping (Bit#(`PADDR) addr);
+       function Tuple2#(Bool, Bit#(TLog#(Num_Slow_Slaves)))
+                     fn_address_mapping (Bit#(`PADDR) addr);
                `ifdef CLINT
                        if(addr>=`ClintBase && addr<=`ClintEnd)
                                return tuple2(True,fromInteger(valueOf(CLINT_slave_num)));
@@ -78,7 +79,8 @@ package slow_peripherals;
        endfunction
 
        (*synthesize*)
-       module mkslow_peripherals#(Clock fast_clock, Reset fast_reset, Clock uart_clock, Reset uart_reset
+       module mkslow_peripherals#(Clock fast_clock, Reset fast_reset,
+                               Clock uart_clock, Reset uart_reset
   `ifdef PWM_AXI4Lite ,Clock ext_pwm_clock `endif )(Ifc_slow_peripherals);
                Clock sp_clock <-exposeCurrentClock; // slow peripheral clock
                Reset sp_reset <-exposeCurrentReset; // slow peripheral reset

diff --git a/src/bsv/interface_decl.py b/src/bsv/interface_decl.py
index 903cd3c8a0cec935917d785d4402f3ccb2ba97ff..5d3182d80c68b25c1ed8c88177d43894a551299e 100644 (file)
--- a/src/bsv/interface_decl.py
+++ b/src/bsv/interface_decl.py
@@ -8,9 +8,8 @@ except ImportError:
 from bsv.wire_def import generic_io  # special case
 from bsv.wire_def import muxwire  # special case
 from ifacebase import InterfacesBase
-from bsv.peripheral_gen import PFactory
-from bsv.peripheral_gen import axi_slave_declarations
-slowfactory = PFactory()
+from bsv.peripheral_gen import PeripheralIface
+from bsv.peripheral_gen import PeripheralInterfaces
 
 
 class Pin(object):
@@ -104,7 +103,7 @@ class Pin(object):
         return res
 
 
-class Interface(object):
+class Interface(PeripheralIface):
     """ create an interface from a list of pinspecs.
         each pinspec is a dictionary, see Pin class arguments
         single indicates that there is only one of these, and
@@ -119,15 +118,12 @@ class Interface(object):
     """
 
     def __init__(self, ifacename, pinspecs, ganged=None, single=False):
+        PeripheralIface.__init__(self, ifacename)
         self.ifacename = ifacename
         self.ganged = ganged or {}
         self.pins = []  # a list of instances of class Pin
         self.pinspecs = pinspecs  # a list of dictionary
         self.single = single
-        self.slow = None
-        slow = slowfactory.getcls(ifacename)
-        if slow:
-            self.slow = slow()
 
         for p in pinspecs:
             _p = {}
@@ -259,31 +255,6 @@ class Interface(object):
         res = res.format(*args)
         return '\n' + res + '\n'
 
-    def slowimport(self):
-        if not self.slow:
-            return ''
-        return self.slow.importfn().format()
-
-    def slowifdecl(self, count):
-        if not self.slow:
-            return ''
-        return self.slow.ifacedecl().format(count, self.ifacename)
-
-    def axi_reg_def(self, start, count):
-        if not self.slow:
-            return ('', 0)
-        return self.slow.axi_reg_def(start, self.ifacename, count)
-
-    def axi_slave_idx(self, start, count):
-        if not self.slow:
-            return ('', 0)
-        return self.slow.axi_slave_idx(start, self.ifacename, count)
-
-    def axi_addr_map(self, count):
-        if not self.slow:
-            return ''
-        return self.slow.axi_addr_map(self.ifacename, count)
-
 
 class MuxInterface(Interface):
 
@@ -307,12 +278,13 @@ class IOInterface(Interface):
         return generic_io.format(*args)
 
 
-class Interfaces(InterfacesBase):
+class Interfaces(InterfacesBase, PeripheralInterfaces):
     """ contains a list of interface definitions
     """
 
     def __init__(self, pth=None):
         InterfacesBase.__init__(self, Interface, pth)
+        PeripheralInterfaces.__init__(self)
 
     def ifacedef(self, f, *args):
         for (name, count) in self.ifacecount:
@@ -345,51 +317,6 @@ class Interfaces(InterfacesBase):
                 f.write(c.format(i))
                 f.write(self.data[name].wirefmt(i))
 
-    def slowimport(self, *args):
-        ret = []
-        for (name, count) in self.ifacecount:
-            ret.append(self.data[name].slowimport())
-        return '\n'.join(list(filter(None, ret)))
-
-    def slowifdecl(self, *args):
-        ret = []
-        for (name, count) in self.ifacecount:
-            for i in range(count):
-                ret.append(self.data[name].slowifdecl(i))
-        return '\n'.join(list(filter(None, ret)))
-
-    def axi_reg_def(self, *args):
-        ret = []
-        start = 0x00011100  # start of AXI peripherals address
-        for (name, count) in self.ifacecount:
-            for i in range(count):
-                x = self.data[name].axi_reg_def(start, i)
-                print ("ifc", name, x)
-                (rdef, offs) = x
-                ret.append(rdef)
-                start += offs
-        return '\n'.join(list(filter(None, ret)))
-
-    def axi_slave_idx(self, *args):
-        ret = []
-        start = 0
-        for (name, count) in self.ifacecount:
-            for i in range(count):
-                (rdef, offs) = self.data[name].axi_slave_idx(start, i)
-                print ("ifc", name, rdef, offs)
-                ret.append(rdef)
-                start += offs
-        ret.append("typedef %d LastGen_slave_num" % (start - 1))
-        decls = '\n'.join(list(filter(None, ret)))
-        return axi_slave_declarations.format(decls)
-
-    def axi_addr_map(self, *args):
-        ret = []
-        for (name, count) in self.ifacecount:
-            for i in range(count):
-                ret.append(self.data[name].axi_addr_map(i))
-        return '\n'.join(list(filter(None, ret)))
-
 
 # ========= Interface declarations ================ #
 

diff --git a/src/bsv/peripheral_gen.py b/src/bsv/peripheral_gen.py
index 6f386b82c2f14e3f99ec621289ddce2ff50a6f0c..f7cd3aafa1bc2d8388851b1f5f15edf948ebefca 100644 (file)
--- a/src/bsv/peripheral_gen.py
+++ b/src/bsv/peripheral_gen.py
@@ -132,6 +132,88 @@ typedef TAdd#(AxiExp1_slave_num,1) Num_Slow_Slaves;
 """
 
 
+class PeripheralIface(object):
+    def __init__(self, ifacename):
+        self.slow = None
+        slow = slowfactory.getcls(ifacename)
+        if slow:
+            self.slow = slow()
+
+    def slowimport(self):
+        if not self.slow:
+            return ''
+        return self.slow.importfn().format()
+
+    def slowifdecl(self, count):
+        if not self.slow:
+            return ''
+        return self.slow.ifacedecl().format(count, self.ifacename)
+
+    def axi_reg_def(self, start, count):
+        if not self.slow:
+            return ('', 0)
+        return self.slow.axi_reg_def(start, self.ifacename, count)
+
+    def axi_slave_idx(self, start, count):
+        if not self.slow:
+            return ('', 0)
+        return self.slow.axi_slave_idx(start, self.ifacename, count)
+
+    def axi_addr_map(self, count):
+        if not self.slow:
+            return ''
+        return self.slow.axi_addr_map(self.ifacename, count)
+
+class PeripheralInterfaces(object):
+    def __init__(self):
+        pass
+
+    def slowimport(self, *args):
+        ret = []
+        for (name, count) in self.ifacecount:
+            ret.append(self.data[name].slowimport())
+        return '\n'.join(list(filter(None, ret)))
+
+    def slowifdecl(self, *args):
+        ret = []
+        for (name, count) in self.ifacecount:
+            for i in range(count):
+                ret.append(self.data[name].slowifdecl(i))
+        return '\n'.join(list(filter(None, ret)))
+
+    def axi_reg_def(self, *args):
+        ret = []
+        start = 0x00011100  # start of AXI peripherals address
+        for (name, count) in self.ifacecount:
+            for i in range(count):
+                x = self.data[name].axi_reg_def(start, i)
+                print ("ifc", name, x)
+                (rdef, offs) = x
+                ret.append(rdef)
+                start += offs
+        return '\n'.join(list(filter(None, ret)))
+
+    def axi_slave_idx(self, *args):
+        ret = []
+        start = 0
+        for (name, count) in self.ifacecount:
+            for i in range(count):
+                (rdef, offs) = self.data[name].axi_slave_idx(start, i)
+                print ("ifc", name, rdef, offs)
+                ret.append(rdef)
+                start += offs
+        ret.append("typedef %d LastGen_slave_num" % (start - 1))
+        decls = '\n'.join(list(filter(None, ret)))
+        return axi_slave_declarations.format(decls)
+
+    def axi_addr_map(self, *args):
+        ret = []
+        for (name, count) in self.ifacecount:
+            for i in range(count):
+                ret.append(self.data[name].axi_addr_map(i))
+        return '\n'.join(list(filter(None, ret)))
+
+
 class PFactory(object):
     def getcls(self, name):
         return {'uart': uart,
@@ -141,3 +223,6 @@ class PFactory(object):
                 'pwm': pwm,
                 'gpio': gpio
                 }.get(name, None)
+
+slowfactory = PFactory()
+