projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f66547f
)
update encoding of ABORT instruction for Marina
author
Adam Megacz
<adam@megacz.com>
Thu, 16 Jul 2009 18:55:55 +0000
(11:55 -0700)
committer
Adam Megacz
<adam@megacz.com>
Thu, 16 Jul 2009 18:55:55 +0000
(11:55 -0700)
src/edu/berkeley/fleet/two/FleetTwoFleet.java
patch
|
blob
|
history
diff --git
a/src/edu/berkeley/fleet/two/FleetTwoFleet.java
b/src/edu/berkeley/fleet/two/FleetTwoFleet.java
index
2f9cb5b
..
c5cae65
100644
(file)
--- a/
src/edu/berkeley/fleet/two/FleetTwoFleet.java
+++ b/
src/edu/berkeley/fleet/two/FleetTwoFleet.java
@@
-108,10
+108,8
@@
public abstract class FleetTwoFleet extends Fleet {
P_OLC_NONZERO = new Mask(".010000..............................");
P_ALWAYS = new Mask(".000000..............................");
P_OLC_NONZERO = new Mask(".010000..............................");
P_ALWAYS = new Mask(".000000..............................");
-
- // use these when Marina gets updated to 07-Jan-2009 version of internal encoding
HEAD = new Mask(".......1.............................");
HEAD = new Mask(".......1.............................");
- ABORT = new Mask("........1............................");
+ ABORT = new Mask("........1......1.........000100000001");
TAIL = new Mask(".........1...........................");
// actually "is interruptible"
TAIL = new Mask(".........1...........................");
// actually "is interruptible"