From 75c6a5bd47f04b052a57e5ef1f5d1fe64ada7d9e Mon Sep 17 00:00:00 2001 From: megacz Date: Tue, 3 Mar 2009 12:53:18 -0800 Subject: [PATCH] relocate PercolatedPort to edu.berkeley.fleet.two --- src/edu/berkeley/fleet/fpga/verilog/Verilog.java | 19 ------------------- src/edu/berkeley/fleet/two/PercolatedPort.java | 17 +++++++++++++++++ src/edu/berkeley/fleet/two/ShipDescription.java | 1 - 3 files changed, 17 insertions(+), 20 deletions(-) create mode 100644 src/edu/berkeley/fleet/two/PercolatedPort.java diff --git a/src/edu/berkeley/fleet/fpga/verilog/Verilog.java b/src/edu/berkeley/fleet/fpga/verilog/Verilog.java index 04985ff..2913416 100644 --- a/src/edu/berkeley/fleet/fpga/verilog/Verilog.java +++ b/src/edu/berkeley/fleet/fpga/verilog/Verilog.java @@ -322,25 +322,6 @@ public class Verilog { public String getVerilog() { return s; } } - // Percolated Ports ////////////////////////////////////////////////////////////////////////////// - - /** - * A PercolatedPort is a connection to a top-level pin; it is - * propagated up or down the hierarchy - */ - public static class PercolatedPort { - public static enum PortType { UP, DOWN, INOUT }; - public final String name; - public final int width; - public final PortType type; - public PercolatedPort(String name, int width, PortType type) { - this.name = name; - this.width = width; - this.type = type; - } - } - - // Module Internals ////////////////////////////////////////////////////////////////////////////// public static class Module { diff --git a/src/edu/berkeley/fleet/two/PercolatedPort.java b/src/edu/berkeley/fleet/two/PercolatedPort.java new file mode 100644 index 0000000..d2fd257 --- /dev/null +++ b/src/edu/berkeley/fleet/two/PercolatedPort.java @@ -0,0 +1,17 @@ +package edu.berkeley.fleet.two; + +/** + * A PercolatedPort is a connection to a top-level pin; it is + * propagated up or down the hierarchy + */ +public class PercolatedPort { + public static enum PortType { UP, DOWN, INOUT }; + public final String name; + public final int width; + public final PortType type; + public PercolatedPort(String name, int width, PortType type) { + this.name = name; + this.width = width; + this.type = type; + } +} diff --git a/src/edu/berkeley/fleet/two/ShipDescription.java b/src/edu/berkeley/fleet/two/ShipDescription.java index 699d6bd..1aa801b 100644 --- a/src/edu/berkeley/fleet/two/ShipDescription.java +++ b/src/edu/berkeley/fleet/two/ShipDescription.java @@ -1,6 +1,5 @@ package edu.berkeley.fleet.two; import edu.berkeley.fleet.api.*; -import edu.berkeley.fleet.fpga.verilog.Verilog.PercolatedPort; import java.io.*; import java.util.*; -- 1.7.10.4