rename spi to consistent name format

diff --git a/src/interface_decl.py b/src/interface_decl.py
index 122de2d1d1da469011491babdeb7f9b4d808d5a6..3bc5e9b8b8dc874d05206230a157f2fe586b1da6 100644 (file)
--- a/src/interface_decl.py
+++ b/src/interface_decl.py
@@ -157,10 +157,10 @@ uartinterface_decl = Interface([{'name': 'rx_{0}'},
                                 {'name': 'tx_{0}', 'action': True},
                                 ])
 
-spiinterface_decl = Interface([{'name': 'sclk_{0}', 'action': True},
-                               {'name': 'mosi_{0}', 'action': True},
-                               {'name': 'ss_{0}', 'action': True},
-                               {'name': 'miso_{0}'},
+spiinterface_decl = Interface([{'name': 'spi{0}_sclk', 'action': True},
+                               {'name': 'spi{0}_mosi', 'action': True},
+                               {'name': 'spi{0}_nss', 'action': True},
+                               {'name': 'spi{0}_miso'},
                                ])
 
 twiinterface_decl = Interface([{'name': 'sda{0}', 'outen': True},

diff --git a/src/interface_def.py b/src/interface_def.py
index e27ab68c8bee8c0d173402fe17ffcd55deeab98a..283e6c2b52bf03b7b63234c65ee7335d5045bbb5 100644 (file)
--- a/src/interface_def.py
+++ b/src/interface_def.py
@@ -24,16 +24,16 @@ uartinterface_def = '''
       endmethod
 '''
 spiinterface_def = '''
-      method Action sclk_{0} (Bit#(1) in);
+      method Action spi{0}_sclk (Bit#(1) in);
          wrspi{0}_sclk<=in;
       endmethod
-      method Action mosi_{0} (Bit#(1) in);
+      method Action spi{0}_mosi (Bit#(1) in);
          wrspi{0}_mosi<=in;
       endmethod
-      method Action ss_{0}   (Bit#(1) in);
-         wrspi{0}_ss<=in;
+      method Action spi{0}_nss   (Bit#(1) in);
+         wrspi{0}_nss<=in;
       endmethod
-      method Bit#(1) miso_{0}=wrspi{0}_miso;
+      method Bit#(1) spi{0}_miso=wrspi{0}_miso;
 '''
 
 twiinterface_def = '''