From 9afe74c971954cdf71386511c44595231f631c8f Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Tue, 27 Mar 2018 08:17:25 +0100 Subject: [PATCH] split out interface printing functions to separate module --- src/spec/c_class.py | 5 +- src/spec/ifaceprint.py | 254 +++++++++++++++++++++++++++++++++++++++++ src/spec/interfaces.py | 252 ---------------------------------------- src/spec/m_class.py | 6 +- 4 files changed, 261 insertions(+), 256 deletions(-) create mode 100644 src/spec/ifaceprint.py diff --git a/src/spec/c_class.py b/src/spec/c_class.py index 917ef90..49128e9 100644 --- a/src/spec/c_class.py +++ b/src/spec/c_class.py @@ -4,8 +4,9 @@ from interfaces import i2s, emmc, sdmmc, spi, quadspi, i2c from interfaces import jtag, uart, ulpi, uartfull, rgbttl, rgmii from interfaces import flexbus1, flexbus2, sdram1, sdram2, mcu8080 from interfaces import eint, pwm, gpio -from interfaces import display, display_fns, check_functions -from interfaces import pinmerge, display_fixed +from interfaces import pinmerge +from ifaceprint import display, display_fns, check_functions +from ifaceprint import display_fixed def pinspec(): pinouts = {} diff --git a/src/spec/ifaceprint.py b/src/spec/ifaceprint.py new file mode 100644 index 0000000..6737eac --- /dev/null +++ b/src/spec/ifaceprint.py @@ -0,0 +1,254 @@ +#!/usr/bin/env python + +from copy import deepcopy + +def display(pins): + print "| Pin | Mux0 | Mux1 | Mux2 | Mux3 |" + print "| --- | ----------- | ----------- | ----------- | ----------- |" + pinidx = pins.keys() + pinidx.sort() + for pin in pinidx: + pdata = pins.get(pin) + res = '| %3d |' % pin + for mux in range(4): + if not pdata.has_key(mux): + res += " |" + continue + name, bank = pdata[mux] + res += " %s %-9s |" % (bank, name) + print res + +def fnsplit(f): + a = '' + n = 0 + if not f.startswith('FB_'): + f2 = f.split('_') + if len(f2) == 2: + if f2[1].isdigit(): + return f2[0], int(f2[1]) + return f2[0], f2[1] + #print f + while f and not f[0].isdigit(): + a += f[0] + f = f[1:] + return a, int(f) if f else None + +def fnsort(f1, f2): + a1, n1 = fnsplit(f1) + a2, n2 = fnsplit(f2) + x = cmp(a1, a2) + if x != 0: + return x + return cmp(n1, n2) + +def find_fn(fname, names): + for n in names: + if fname.startswith(n): + return n + +def display_fns(bankspec, pins, function_names): + fn_names = function_names.keys() + fns = {} + for (pin, pdata) in pins.items(): + for mux in range(1,4): # skip GPIO for now + if not pdata.has_key(mux): + continue + name, bank = pdata[mux] + assert name != None, str(bank) + if not fns.has_key(name): + fns[name] = [] + fns[name].append((pin-bankspec[bank], mux, bank)) + + fnidx = fns.keys() + fnidx.sort(fnsort) + current_fn = None + for fname in fnidx: + fnbase = find_fn(fname, fn_names) + #print "name", fname, fnbase + if fnbase != current_fn: + if current_fn is not None: + print + print "## %s" % fnbase + print + print function_names[fnbase] + print + current_fn = fnbase + print "* %-9s :" % fname, + for (pin, mux, bank) in fns[fname]: + print "%s%d/%d" % (bank, pin, mux), + print + + return fns + +def check_functions(title, bankspec, fns, pins, required, eint, pwm, + descriptions=None): + fns = deepcopy(fns) + pins = deepcopy(pins) + if descriptions is None: + descriptions = {} + + print "# Pinmap for %s" % title + print + + + for name in required: + print "## %s" % name + print + if descriptions and descriptions.has_key(name): + print descriptions[name] + print + + name = name.split(':') + if len(name) == 2: + findbank = name[0][0] + findmux = int(name[0][1:]) + name = name[1] + else: + name = name[0] + findbank = None + findmux = None + name = name.split('/') + if len(name) == 2: + count = int(name[1]) + else: + count = 100000 + name = name[0] + found = set() + fnidx = fns.keys() + #fnidx.sort(fnsort) + pinfound = {} + for fname in fnidx: + if not fname.startswith(name): + continue + for pin, mux, bank in fns[fname]: + if findbank is not None: + if findbank != bank: + continue + if findmux != mux: + continue + pin_ = pin + bankspec[bank] + if pins.has_key(pin_): + pinfound[pin_] = (fname, pin_, bank, pin, mux) + + pinidx = pinfound.keys() + pinidx.sort() + + for pin_ in pinidx: + fname, pin_, bank, pin, mux = pinfound[pin_] + if fname in found: + continue + found.add(fname) + if len(found) > count: + continue + del pins[pin_] + print "* %s %d %s%d/%d" % (fname, pin_, bank, pin, mux) + + print + + # gpios + gpios = [] + for name in descriptions.keys(): + if not name.startswith('GPIO'): + continue + if name == 'GPIO': + continue + gpios.append(name) + gpios.sort() + + if gpios: + print "## GPIO" + print + + for fname in gpios: + if fname in found: + continue + desc = '' + if descriptions and descriptions.has_key(fname): + desc = ': %s' % descriptions[fname] + bank = fname[4] + pin = int(fname[5:]) + pin_ = pin + bankspec[bank] + if not pins.has_key(pin_): + continue + del pins[pin_] + found.add(fname) + print "* %-8s %d %s%-2d %s" % (fname, pin_, bank, pin, desc) + print + + if eint: + display_group(bankspec, "EINT", eint, fns, pins, descriptions) + if pwm: + display_group(bankspec, "PWM", pwm, fns, pins, descriptions) + + print "## Unused Pinouts (spare as GPIO) for '%s'" % title + print + if descriptions and descriptions.has_key('GPIO'): + print descriptions['GPIO'] + print + display(pins) + print + + return pins # unused + +def display_group(bankspec, title, todisplay, fns, pins, descriptions): + print "## %s" % title + print + + found = set() + for fname in todisplay: + desc = '' + if descriptions and descriptions.has_key(fname): + desc = ': %s' % descriptions[fname] + fname = fname.split(':') + if len(fname) == 2: + findbank = fname[0][0] + findmux = int(fname[0][1:]) + fname = fname[1] + else: + fname = fname[0] + findbank = None + findmux = None + for (pin, mux, bank) in fns[fname]: + if findbank is not None: + if findbank != bank: + continue + if findmux != mux: + continue + if fname in found: + continue + pin_ = pin + bankspec[bank] + if not pins.has_key(pin_): + continue + del pins[pin_] + found.add(fname) + print "* %s %d %s%d/%d %s" % (fname, pin_, bank, pin, mux, desc) + print + +def display_fixed(fixed, offs): + + fkeys = fixed.keys() + fkeys.sort() + pin_ = offs + for pin, k in enumerate(fkeys): + print "## %s" % k + print + prevname = '' + linecount = 0 + for name in fixed[k]: + if linecount == 4: + linecount = 0 + print + if prevname[:2] == name[:2] and linecount != 0: + print name, + linecount += 1 + else: + if linecount != 0: + print + print "* %d: %d %s" % (pin_, pin, name), + linecount = 1 + prevname = name + pin_ += 1 + if linecount != 0: + print + print + diff --git a/src/spec/interfaces.py b/src/spec/interfaces.py index 263e5d8..864821a 100644 --- a/src/spec/interfaces.py +++ b/src/spec/interfaces.py @@ -1,7 +1,5 @@ #!/usr/bin/env python -from copy import deepcopy - class Pinouts(object): def __init__(self): self.pins = {} @@ -282,228 +280,6 @@ def gpio(bankspec, suffix, offs, bank, gpiooffs, gpionum=1, mux=1, spec=None): return _pinbank(bankspec, "GPIO", suffix, offs, bank, gpiooffs, gpionum, mux=0, spec=None) -def display(pins): - print "| Pin | Mux0 | Mux1 | Mux2 | Mux3 |" - print "| --- | ----------- | ----------- | ----------- | ----------- |" - pinidx = pins.keys() - pinidx.sort() - for pin in pinidx: - pdata = pins.get(pin) - res = '| %3d |' % pin - for mux in range(4): - if not pdata.has_key(mux): - res += " |" - continue - name, bank = pdata[mux] - res += " %s %-9s |" % (bank, name) - print res - -def fnsplit(f): - a = '' - n = 0 - if not f.startswith('FB_'): - f2 = f.split('_') - if len(f2) == 2: - if f2[1].isdigit(): - return f2[0], int(f2[1]) - return f2[0], f2[1] - #print f - while f and not f[0].isdigit(): - a += f[0] - f = f[1:] - return a, int(f) if f else None - -def fnsort(f1, f2): - a1, n1 = fnsplit(f1) - a2, n2 = fnsplit(f2) - x = cmp(a1, a2) - if x != 0: - return x - return cmp(n1, n2) - -def find_fn(fname, names): - for n in names: - if fname.startswith(n): - return n - -def display_fns(bankspec, pins, function_names): - fn_names = function_names.keys() - fns = {} - for (pin, pdata) in pins.items(): - for mux in range(1,4): # skip GPIO for now - if not pdata.has_key(mux): - continue - name, bank = pdata[mux] - assert name != None, str(bank) - if not fns.has_key(name): - fns[name] = [] - fns[name].append((pin-bankspec[bank], mux, bank)) - - fnidx = fns.keys() - fnidx.sort(fnsort) - current_fn = None - for fname in fnidx: - fnbase = find_fn(fname, fn_names) - #print "name", fname, fnbase - if fnbase != current_fn: - if current_fn is not None: - print - print "## %s" % fnbase - print - print function_names[fnbase] - print - current_fn = fnbase - print "* %-9s :" % fname, - for (pin, mux, bank) in fns[fname]: - print "%s%d/%d" % (bank, pin, mux), - print - - return fns - -def check_functions(title, bankspec, fns, pins, required, eint, pwm, - descriptions=None): - fns = deepcopy(fns) - pins = deepcopy(pins) - if descriptions is None: - descriptions = {} - - print "# Pinmap for %s" % title - print - - - for name in required: - print "## %s" % name - print - if descriptions and descriptions.has_key(name): - print descriptions[name] - print - - name = name.split(':') - if len(name) == 2: - findbank = name[0][0] - findmux = int(name[0][1:]) - name = name[1] - else: - name = name[0] - findbank = None - findmux = None - name = name.split('/') - if len(name) == 2: - count = int(name[1]) - else: - count = 100000 - name = name[0] - found = set() - fnidx = fns.keys() - #fnidx.sort(fnsort) - pinfound = {} - for fname in fnidx: - if not fname.startswith(name): - continue - for pin, mux, bank in fns[fname]: - if findbank is not None: - if findbank != bank: - continue - if findmux != mux: - continue - pin_ = pin + bankspec[bank] - if pins.has_key(pin_): - pinfound[pin_] = (fname, pin_, bank, pin, mux) - - pinidx = pinfound.keys() - pinidx.sort() - - for pin_ in pinidx: - fname, pin_, bank, pin, mux = pinfound[pin_] - if fname in found: - continue - found.add(fname) - if len(found) > count: - continue - del pins[pin_] - print "* %s %d %s%d/%d" % (fname, pin_, bank, pin, mux) - - print - - # gpios - gpios = [] - for name in descriptions.keys(): - if not name.startswith('GPIO'): - continue - if name == 'GPIO': - continue - gpios.append(name) - gpios.sort() - - if gpios: - print "## GPIO" - print - - for fname in gpios: - if fname in found: - continue - desc = '' - if descriptions and descriptions.has_key(fname): - desc = ': %s' % descriptions[fname] - bank = fname[4] - pin = int(fname[5:]) - pin_ = pin + bankspec[bank] - if not pins.has_key(pin_): - continue - del pins[pin_] - found.add(fname) - print "* %-8s %d %s%-2d %s" % (fname, pin_, bank, pin, desc) - print - - if eint: - display_group(bankspec, "EINT", eint, fns, pins, descriptions) - if pwm: - display_group(bankspec, "PWM", pwm, fns, pins, descriptions) - - print "## Unused Pinouts (spare as GPIO) for '%s'" % title - print - if descriptions and descriptions.has_key('GPIO'): - print descriptions['GPIO'] - print - display(pins) - print - - return pins # unused - -def display_group(bankspec, title, todisplay, fns, pins, descriptions): - print "## %s" % title - print - - found = set() - for fname in todisplay: - desc = '' - if descriptions and descriptions.has_key(fname): - desc = ': %s' % descriptions[fname] - fname = fname.split(':') - if len(fname) == 2: - findbank = fname[0][0] - findmux = int(fname[0][1:]) - fname = fname[1] - else: - fname = fname[0] - findbank = None - findmux = None - for (pin, mux, bank) in fns[fname]: - if findbank is not None: - if findbank != bank: - continue - if findmux != mux: - continue - if fname in found: - continue - pin_ = pin + bankspec[bank] - if not pins.has_key(pin_): - continue - del pins[pin_] - found.add(fname) - print "* %s %d %s%d/%d %s" % (fname, pin_, bank, pin, mux, desc) - print - def pinmerge(pins, fn): # hack, store the function specs in the pins dict fname = fn.fname @@ -530,31 +306,3 @@ def pinmerge(pins, fn): print "pinidx", pinidx pins.update(pinidx, v) -def display_fixed(fixed, offs): - - fkeys = fixed.keys() - fkeys.sort() - pin_ = offs - for pin, k in enumerate(fkeys): - print "## %s" % k - print - prevname = '' - linecount = 0 - for name in fixed[k]: - if linecount == 4: - linecount = 0 - print - if prevname[:2] == name[:2] and linecount != 0: - print name, - linecount += 1 - else: - if linecount != 0: - print - print "* %d: %d %s" % (pin_, pin, name), - linecount = 1 - prevname = name - pin_ += 1 - if linecount != 0: - print - print - diff --git a/src/spec/m_class.py b/src/spec/m_class.py index 7f92a50..768177b 100644 --- a/src/spec/m_class.py +++ b/src/spec/m_class.py @@ -4,8 +4,10 @@ from interfaces import jtag, uart, ulpi, uartfull, rgbttl, rgmii from interfaces import flexbus1, flexbus2, sdram1, sdram2, mcu8080 from interfaces import eint, pwm, gpio, spi, i2c, emmc, sdmmc from interfaces import quadspi, i2s -from interfaces import display, display_fns, check_functions -from interfaces import pinmerge, display_fixed, Pinouts +from interfaces import pinmerge, Pinouts + +from ifaceprint import display, display_fns, check_functions +from ifaceprint import display_fixed def pinspec(): pinouts = Pinouts() -- 2.30.2