use quart wrapper for quart

[pinmux.git] / src / bsv / peripheral_gen / quart.py

diff --git a/src/bsv/peripheral_gen/quart.py b/src/bsv/peripheral_gen/quart.py
index 0d314ddde000c293c87eca3b8ffcf50ff67f2d9f..165de6709c1939d31c653cf215a8755a1fe1ace0 100644 (file)
--- a/src/bsv/peripheral_gen/quart.py
+++ b/src/bsv/peripheral_gen/quart.py
@@ -1,46 +1,54 @@
 from bsv.peripheral_gen.base import PBase
 
+
 class quart(PBase):
 
     def slowimport(self):
-        return "    import Uart16550         :: *;"
+        return "import quart :: *;"
+
+    def irq_name(self):
+        return "quart{0}_intr"
 
     def slowifdecl(self):
-        return "            interface RS232_PHY_Ifc quart{0}_coe;\n" + \
-               "            method Bit#(1) quart{0}_intr;"
+        return "interface QUART_out quart{0};\n" + \
+               "method Bit#(1) %s;" % self.irq_name()
+
+    def get_clock_reset(self, name, count):
+        return "slow_clock,slow_reset"  # XXX TODO: change to uart_clock/reset
 
     def num_axi_regs32(self):
         return 8
 
     def mkslow_peripheral(self, size=0):
-        return "        Uart16550_AXI4_Lite_Ifc quart{0} <- \n" + \
+        return "// XXX TODO: change to uart_clock/reset\n" + \
+               "Uart16550_AXI4_Lite_Ifc quart{0} <- \n" + \
                "                mkUart16550(clocked_by sp_clock,\n" + \
-               "                    reset_by uart_reset, sp_clock, sp_reset);"
+               "                    reset_by sp_reset, sp_clock, sp_reset);"
 
     def _mk_connection(self, name=None, count=0):
-        return "quart{0}.slave_axi_uart"
+        return "quart{0}.slave"
 
     def pinname_out(self, pname):
-        return {'tx' : 'coe_rs232.modem_output_stx',
-                'rts': 'coe_rs232.modem_output_rts',
-               }.get(pname, '')
+        return {'tx': 'out.stx_out',
+                'rts': 'out.rts_out',
+                }.get(pname, '')
 
-    def _pinname_in(self, pname):
-        return {'rx': 'coe_rs232.modem_input.srx', 
-                'cts': 'coe_rs232.modem_input.cts'
-               }.get(pname, '')
+    def pinname_in(self, pname):
+        return {'rx': 'out.srx_in',
+                'cts': 'out.cts_in'
+                }.get(pname, '')
 
-    def mk_pincon(self, name, count):
+    def __disabled_mk_pincon(self, name, count):
         ret = [PBase.mk_pincon(self, name, count)]
-        ret.append("    rule con_%s%d_io_in;" % (name, count))
-        ret.append("       {0}{1}.coe_rs232.modem_input(".format(name, count))
+        ret.append("rule con_%s%d_io_in;" % (name, count))
+        ret.append("    {0}{1}.out.modem_input(".format(name, count))
         for idx, pname in enumerate(['rx', 'cts']):
             sname = self.peripheral.pname(pname).format(count)
             ps = "pinmux.peripheral_side.%s" % sname
             ret.append("            {0},".format(ps))
         ret.append("            1'b1,1'b0,1'b1")
-        ret.append("        );")
-        ret.append("    endrule")
+        ret.append("     );")
+        ret.append("endrule")
 
         return '\n'.join(ret)
 
@@ -59,17 +67,18 @@ class quart(PBase):
 
     def mk_ext_ifacedef(self, iname, inum):
         name = self.get_iname(inum)
-        return "        method {0}_intr = {0}.irq;".format(name)
+        return "method {0}_intr = {0}.irq;".format(name)
+
+    def slowifdeclmux(self, name, count):
+        sname = self.peripheral.iname().format(count)
+        return "method Bit#(1) %s_intr;" % sname
 
-    def slowifdeclmux(self):
-        return "        method Bit#(1) {1}{0}_intr;"
 
 uart_plic_template = """\
-     // PLIC {0} synchronisation with irq {1}
-     SyncBitIfc#(Bit#(1)) {0}_interrupt <-
-                                mkSyncBitToCC(sp_clock, uart_reset);
-     rule plic_synchronize_{0}_interrupt_{1};
-         {0}_interrupt.send({0}.irq);
-     endrule
+// PLIC {0} synchronisation with irq {1}
+SyncBitIfc#(Bit#(1)) {0}_interrupt <-
+                            mkSyncBitToCC(sp_clock, uart_reset);
+rule plic_synchronize_{0}_interrupt_{1};
+     {0}_interrupt.send({0}.irq);
+endrule
 """
-