relocate PercolatedPort to edu.berkeley.fleet.two

diff --git a/src/edu/berkeley/fleet/fpga/verilog/Verilog.java b/src/edu/berkeley/fleet/fpga/verilog/Verilog.java
index 04985ff..2913416 100644 (file)
--- 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 (file)
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 (file)
--- 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.*;