From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 22 Mar 2018 04:39:23 +0000 (+0000)
Subject: uart naming convention consistency
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7319e7539e669fc809b837d379ae853a6351e764;p=pinmux.git

uart naming convention consistency
---

diff --git a/src/interface_decl.py b/src/interface_decl.py
index 1934870..936c77d 100644
--- a/src/interface_decl.py
+++ b/src/interface_decl.py
@@ -139,8 +139,8 @@ io_interface = IOInterface([{'name': 'io_outputval_{0}', 'enabled': False},
 # Outputs from the peripherals will be inputs to the pinmux
 # module. Hence the change in direction for most pins
 
-uartinterface_decl = Interface([{'name': 'rx_{0}'},
-                                {'name': 'tx_{0}', 'action': True},
+uartinterface_decl = Interface([{'name': 'uart{0}_rx'},
+                                {'name': 'uart{0}_tx', 'action': True},
                                 ])
 
 spiinterface_decl = Interface([{'name': 'spi{0}_sclk', 'action': True},
diff --git a/src/interface_def.py b/src/interface_def.py
index 42ce5f2..6e5ed70 100644
--- a/src/interface_def.py
+++ b/src/interface_def.py
@@ -18,8 +18,8 @@ io_interface_def = '''
       endmethod
 '''
 uartinterface_def = '''
-      method rx_{0}=wruart{0}_rx;
-      method Action tx_{0}(Bit#(1) in);
+      method uart{0}_rx=wruart{0}_rx;
+      method Action uart{0}_tx(Bit#(1) in);
          wruart{0}_tx<=in;
       endmethod
 '''