use class iterator for mk_connection (all of them)

[pinmux.git] / src / parse.py

diff --git a/src/parse.py b/src/parse.py
index 12e20cadf72e04e7c996bc518129d6239033e74c..8d67b01e0b2e2809b39120a4804c9646133a9074 100644 (file)
--- a/src/parse.py
+++ b/src/parse.py
@@ -22,9 +22,11 @@ class Parse(object):
 
         max_io = 0
         self.muxed_cells = []
+        self.muxed_cells_width = []
+        self.muxed_cells_bank = []
         self.dedicated_cells = []
         self.pinnumbers = []
-        self.bankwidths = {} 
+        self.bankwidths = {}
         self.banksize = {}
         self.bankstart = {}
 
@@ -37,7 +39,7 @@ class Parse(object):
                 self.bankwidths[line1[0]] = int(line1[3])
                 self.banksize[line1[0]] = int(line1[2])
                 self.bankstart[line1[0]] = int(line1[1])
-            
+
         # == capture the number of IO cells required == #
         fname = 'pinmap.txt'
         if pth:
@@ -45,17 +47,21 @@ class Parse(object):
         with open(fname) as pinmapfile:
             for lineno, line in enumerate(pinmapfile):
                 line1 = line[:-1].split('\t')
-                if len(line1) <= 2:
+                if len(line1) <= 3:
                     continue
                 self.pinnumbers.append(int(line1[0]))
+                self.muxed_cells_bank.append(line1[1])
+                self.muxed_cells_width.append(int(line1[2]))
                 # XXX TODO: dedicated pins in separate file
-                #if len(line1) == 2:  # dedicated
+                # if len(line1) == 2:  # dedicated
                 #    self.dedicated_cells.append(line1)
-                #else:
-                for i in range(1, len(line1)):
+                # else:
+                for i in range(3, len(line1)):
                     # XXX HORRIBLE HACK!!
                     if line1[i].startswith('pwm'):
                         line1[i] = 'pwm%s_out' % line1[i][4:]
+                line1 = [line1[0]] + line1[3:]
+                print "line", line1
                 self.muxed_cells.append(line1)
 
         self.pinnumbers = sorted(self.pinnumbers)
@@ -71,7 +77,7 @@ class Parse(object):
         #print("Muxer bit width: " + str(self.cell_bitwidth))
         print("Muxed IOs: " + str(len(self.muxed_cells)))
         print("Dedicated IOs: " + str(len(self.dedicated_cells)))
-        #sys.exit(0)
+        # sys.exit(0)
 
     def do_checks(self):
         """ Multiple checks to see if the user has not screwed up
@@ -106,13 +112,22 @@ class Parse(object):
 
         # TODO
 
-    def get_cell_bit_widths(self, banks):
+    def get_max_cell_bitwidth(self):
         max_num_cells = 0
         for cell in self.muxed_cells:
             print cell
             max_num_cells = max(len(cell) - 1, max_num_cells)
         return int(math.log(max_num_cells + 1, 2))
 
+    def get_muxwidth(self, cellnum):
+        return self.muxed_cells_width[int(cellnum)]
+
+    def get_muxbitwidth(self, cellnum):
+        wid = self.get_muxwidth(cellnum)
+        if wid == 1:
+            return 0
+        return int(math.log(wid + 1, 2))
+
 
 if __name__ == '__main__':
     p = Parse()