Break Fpga.java into separate subclasses for ML509.Large, ML509.Small, and Bee2

[fleet.git] / src / edu / berkeley / fleet / fpga / FunnelModule.java

diff --git a/src/edu/berkeley/fleet/fpga/FunnelModule.java b/src/edu/berkeley/fleet/fpga/FunnelModule.java
index b138a9e..7593133 100644 (file)
--- a/src/edu/berkeley/fleet/fpga/FunnelModule.java
+++ b/src/edu/berkeley/fleet/fpga/FunnelModule.java
@@ -17,7 +17,7 @@ public class FunnelModule extends Module {
 
     public FunnelModule(Fpga fpga) {
         super("funnel");
-        Module.SinkPort    outp = createOutputPort("out", fpga.WIDTH_PACKET, "");
+        Module.SinkPort    outp = createOutputPort("out", fpga.WIDTH_PACKET);
         Module.SourcePort  in1p = createInputPort("in1", fpga.WIDTH_PACKET);
         Module.SourcePort  in2p = createInputPort("in2", fpga.WIDTH_PACKET);
 
@@ -55,7 +55,8 @@ public class FunnelModule extends Module {
         public void addInput(FabricElement in, Module.Port source) {
             throw new RuntimeException("cannot add inputs to a funnel once constructed");
         }
-        public FpgaPath getPath(FabricElement dest, BitVector signal) {
+        public int      getPathLength(FpgaDestination dest) { return out.getPathLength(dest)+1; }
+        public FpgaPath getPath(FpgaDestination dest, BitVector signal) {
             return out.getPath(dest, signal);
         }
     }