From: Luke Kenneth Casson Leighton Date: Thu, 22 Mar 2018 05:07:01 +0000 (+0000) Subject: use auto-generate on interface definitions X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7163819cb24c542d9975b095ac779f25b8c76599;p=pinmux.git use auto-generate on interface definitions --- diff --git a/src/interface_decl.py b/src/interface_decl.py index 50f8ce7..01be379 100644 --- a/src/interface_decl.py +++ b/src/interface_decl.py @@ -105,7 +105,6 @@ class Interface(object): def ifacedef(self, *args): res = '\n'.join(map(self.ifacefmtpin, self.pins)) - print res res = res.format(*args) return '\n' + res + '\n' diff --git a/src/pinmux_generator.py b/src/pinmux_generator.py index 5ca1ba8..eeb0c06 100644 --- a/src/pinmux_generator.py +++ b/src/pinmux_generator.py @@ -212,13 +212,13 @@ with open("./bsv_src/pinmux.bsv", "w") as bsv_file: for i in range(0, N_IO): bsv_file.write(io_interface.ifacedef(i)) for i in range(0, N_UART): - bsv_file.write(uartinterface_def.format(i)) + bsv_file.write(uartinterface_decl.ifacedef(i)) for i in range(0, N_SPI): bsv_file.write(spiinterface_def.format(i)) for i in range(0, N_TWI): - bsv_file.write(twiinterface_def.format(i)) + bsv_file.write(twiinterface_decl.ifacedef(i)) for i in range(0, N_SD): - bsv_file.write(sdinterface_def.format(i)) + bsv_file.write(sdinterface_decl.ifacedef(i)) for i in range(0, N_JTAG): bsv_file.write(jtaginterface_def.format(i)) for i in range(0, N_PWM):