projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a96db42
)
remove ZBT from Fpga.java
author
megacz
<adam@megacz.com>
Fri, 20 Mar 2009 02:10:00 +0000
(19:10 -0700)
committer
megacz
<adam@megacz.com>
Fri, 20 Mar 2009 02:10:00 +0000
(19:10 -0700)
src/edu/berkeley/fleet/fpga/Fpga.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/fpga/Fpga.java
b/src/edu/berkeley/fleet/fpga/Fpga.java
index
eaa559c
..
46ff045
100644
(file)
--- a/
src/edu/berkeley/fleet/fpga/Fpga.java
+++ b/
src/edu/berkeley/fleet/fpga/Fpga.java
@@
-78,8
+78,8
@@
public class Fpga extends FleetTwoFleet {
this.top = top;
debugShip = createShip("Debug");
this.top = top;
debugShip = createShip("Debug");
- //boolean small = true;
- boolean small = false;
+ boolean small = true;
+ //boolean small = false;
if (small) {
for(int i=0; i<2; i++) createShip("Alu");
if (small) {
for(int i=0; i<2; i++) createShip("Alu");
@@
-92,21
+92,15
@@
public class Fpga extends FleetTwoFleet {
createShip("Timer");
createShip("DDR2");
createShip("Dvi");
createShip("Timer");
createShip("DDR2");
createShip("Dvi");
- createShip("ZBT");
} else {
for(int i=0; i<3; i++) createShip("Memory");
for(int i=0; i<3; i++) createShip("Alu");
for(int i=0; i<2; i++) createShip("Fifo");
} else {
for(int i=0; i<3; i++) createShip("Memory");
for(int i=0; i<3; i++) createShip("Alu");
for(int i=0; i<2; i++) createShip("Fifo");
- for(int i=0; i<11; i++) createShip("Counter");
-
- /*
- for(int i=0; i<3; i++) createShip("Memory");
- for(int i=0; i<3; i++) createShip("Alu");
- for(int i=0; i<2; i++) createShip("Fifo");
for(int i=0; i<14; i++) createShip("Counter");
for(int i=0; i<14; i++) createShip("Counter");
+ /*
// "really big" configuration: 138 docks
for(int i=0; i<4; i++) createShip("Alu");
*/
// "really big" configuration: 138 docks
for(int i=0; i<4; i++) createShip("Alu");
*/
@@
-118,7
+112,6
@@
public class Fpga extends FleetTwoFleet {
createShip("Timer");
createShip("DDR2");
createShip("Dvi");
createShip("Timer");
createShip("DDR2");
createShip("Dvi");
- //createShip("ZBT");
}
// for FifoShip
}
// for FifoShip