From: Adam Megacz <adam@megacz.com>
Date: Sat, 1 Aug 2009 06:08:02 +0000 (-0700)
Subject: add a Fifo to the Fpga large configuration so the test suite will pass
X-Git-Url: http://git.megacz.com/?p=fleet.git;a=commitdiff_plain;h=6db6a33919f27f3c5bdfdb407138196c33d78c3e

add a Fifo to the Fpga large configuration so the test suite will pass
---

diff --git a/src/edu/berkeley/fleet/fpga/Fpga.java b/src/edu/berkeley/fleet/fpga/Fpga.java
index 20567ed..42cd3a7 100644
--- a/src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/src/edu/berkeley/fleet/fpga/Fpga.java
@@ -94,9 +94,8 @@ public class Fpga extends FleetTwoFleet {
 
             for(int i=0; i<2; i++)  createShip("Memory");
             for(int i=0; i<6; i++)  createShip("Alu");
-            //for(int i=0; i<2; i++)  createShip("Fifo");
+            for(int i=0; i<1; i++)  createShip("Fifo");
             for(int i=0; i<12; i++) createShip("Counter");
-            //for(int i=0; i<2; i++)  createShip("Null");
 
             //createShip("CarrySaveAdder");
             //createShip("Rotator");
diff --git a/tests/requeue/test-for-common-requeue-timing-error.fleet b/tests/requeue/test-for-common-requeue-timing-error.fleet
index 4a9e007..44a1fba 100644
--- a/tests/requeue/test-for-common-requeue-timing-error.fleet
+++ b/tests/requeue/test-for-common-requeue-timing-error.fleet
@@ -7,7 +7,6 @@
 
 #ship debug0       : Debug
 #ship fifo0        : Fifo
-#ship fifo1        : Fifo
 #ship alu20        : Alu
 #ship alu21        : Alu