Revert "genlib/record: support passing params in same object"
authorSebastien Bourdeauducq <sebastien@milkymist.org>
Tue, 22 Oct 2013 13:23:00 +0000 (15:23 +0200)
committerSebastien Bourdeauducq <sebastien@milkymist.org>
Tue, 22 Oct 2013 13:23:00 +0000 (15:23 +0200)
This reverts commit 018afe57ef52b8040934319cac848437a2ba0163.

migen/genlib/record.py

index 521dcb2c12976a5fb7cd7d5362abf87a4cc73b28..10e3a43cf186714954b53a01bf8a6dbce9c4289c 100644 (file)
@@ -56,21 +56,11 @@ def layout_partial(layout, *elements):
                insert_ref.append(layout_get(copy_ref, last))
        return r
 
-class LayoutP:
-       def __init__(self, layout, **layout_dict):
-               self.layout = layout
-               self.layout_dict = layout_dict
-
 class Record:
        def __init__(self, layout, name=None, **layout_dict):
                self.name = get_obj_var_name(name, "")
-               if isinstance(layout, LayoutP):
-                       self.layout = layout.layout
-                       self.layout_dict = layout.layout_dict
-                       assert(not layout_dict)
-               else:
-                       self.layout = layout
-                       self.layout_dict = layout_dict
+               self.layout = layout
+               self.layout_dict = layout_dict
 
                if self.name:
                        prefix = self.name + "_"