Quad package now complete

Author: robtaylor

chipflow_lib/pin_lock.py

@@ -40,52 +40,17 @@ def lock_pins() -> None:
     print(f"Locking pins: {'using pins.lock' if lockfile.exists() else ''}")
 
     process = config_model.chipflow.silicon.process
-    package_name = config_model.chipflow.silicon.package
+    package = config_model.chipflow.silicon.package
 
-    if package_name not in PACKAGE_DEFINITIONS:
-        logger.debug(f"Package '{package_name} is unknown")
-
-    # TODO, ugh, clean this up.
-    package = Package(package_type=PACKAGE_DEFINITIONS[package_name])
-
-    # Initialize standard pins from package type
-    package.initialize_from_package_type()
-
-    # Process user-defined pads
-    logger.debug(f"Checking [chipflow.silicon.pads]:") if hasattr(config_model.chipflow.silicon, "pads") else ...
-    silicon_config = getattr(config_model.chipflow.silicon, "pads", {})
-    for k, v in silicon_config.items():
-        pin = str(v.loc)
-
-        # Convert Pydantic model to dict for backward compatibility
-        v_dict = {"type": v.type, "loc": v.loc}
-        port = oldlock.package.check_pad(k, v_dict) if oldlock else None
-
-        if port and port.pins != [pin]:
-            raise ChipFlowError(
-                f"chipflow.toml conflicts with pins.lock: "
-                f"{k} had pin {port.pins}, now {[pin]}."
-            )
-
-        # Add pad to package
-        package.add_pad(k, v_dict)
-
-    # TODO: power pins
-    #
-    logger.debug(f'Pins in use: {package_type.sortpins(used_pins)}')
-
-    unallocated = package_type.pins - used_pins
-
-    logger.debug(f"unallocated pins = {package_type.sortpins(unallocated)}")
+    package_def = config_model.chipflow.silicon.package.package_type
 
     top = top_components(config_dict)
 
     # Use the PackageDef to allocate the pins:
-    for component, iface in interfaces.items():
-    newlock = LockFile(process=process,
-                       package=package,
-                       port_map=port_map,
-                       metadata=interfaces)
+    for name, component in top.items():
+        package_def.register_component(name, component)
+
+    newlock = package_def.allocate_pins()
 
     with open(lockfile, 'w') as f:
         f.write(newlock.model_dump_json(indent=2, serialize_as_any=True))