flexbus merging of ganged bus group

diff --git a/src/spec/i_class.py b/src/spec/i_class.py
index 966d84338e763463659a4360d10c9d545bd9f169..35cf8c6ff18d88d7c1f6476a218c4e72de77c589 100644 (file)
--- a/src/spec/i_class.py
+++ b/src/spec/i_class.py
@@ -10,7 +10,7 @@ def pinspec():
     pinbanks = {
         'A': 28,
         'B': 32,
-        'C': 32,
+        'C': 24,
     }
     fixedpins = {
         'CTRL_SYS': [

diff --git a/src/spec/interfaces.py b/src/spec/interfaces.py
index e2cddba6b3e606d9279c1b1c553693591e8347f0..b35e9350be9316c3ac8ead2916a7810c098f9c11 100644 (file)
--- a/src/spec/interfaces.py
+++ b/src/spec/interfaces.py
@@ -97,7 +97,10 @@ class Pinouts(object):
             setattr(self, name, PinGen(self, fname, pinfn, self.bankspec))
 
     def setganged(self, fname, grp):
-        self.ganged[fname] = map(lambda x: x[:-1], grp)
+        grp = map(lambda x: x[:-1], grp)
+        if not self.ganged.has_key(fname):
+            self.ganged[fname] = []
+        self.ganged[fname] += grp
 
     def __contains__(self, k):
         return k in self.pins