From 30efb94b64e4df9ea00cc2f9ef4e0be0192cbcc0 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Wed, 13 Jun 2018 13:23:34 +0100 Subject: [PATCH] Revert "input cell-types now output 0 on output as well.\" This reverts commit 197f0c589dce79e1c8e91c5df47903aae397afbf. --- src/bsv/actual_pinmux.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/bsv/actual_pinmux.py b/src/bsv/actual_pinmux.py index a4ff0e4..a920db6 100644 --- a/src/bsv/actual_pinmux.py +++ b/src/bsv/actual_pinmux.py @@ -36,22 +36,14 @@ def transfn(temp): temp[0] = temp[0] .replace(' ', '') return '_'.join(temp) -def fmt(ifaces, cell): +def fmt(cell): """ blank entries need to output a 0 to the pin (it could just as well be a 1 but we choose 0). reason: blank entries in the pinmap.txt file indicate that there's nothing to choose from. however the user may still set the muxer to that value, and rather than throw an exception we choose to output... zero. """ - empty = '0' # XXX TODO: fix this, as it's assigned to GenericIOType - if not cell: - return empty - # work out the type. if it's an input, return empty - temp = cell[1].translate(digits) - x = ifaces.getifacetype(temp) - if x == 'input': - return empty - return "%s_io" % cell + return "%s_io" % cell if cell else '0' def init(p, ifaces): """ generates the actual output pinmux for each io-cell. blank lines @@ -65,8 +57,8 @@ def init(p, ifaces): p.pinmux += " %s_out=" % cn(cell[0]) for i in range(0, len(cell) - 2): p.pinmux += "wr%s" % cn(cell[0]) + \ - "==" + str(i) + "?" + fmt(ifaces, cell[i + 1]) + ":\n\t\t\t" - p.pinmux += fmt(ifaces, cell[i + 2]) + "==" + str(i) + "?" + fmt(cell[i + 1]) + ":\n\t\t\t" + p.pinmux += fmt(cell[i + 2]) p.pinmux += ";\n" # ======================================================== # -- 2.30.2