update comment on MarinaUtils.RingIfc, remove stale comments

diff --git a/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java b/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java
index 0055042..d0acdce 100644 (file)
--- a/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/MarinaUtils.java
@@ -7,21 +7,30 @@ import java.util.Random;
 import java.util.ArrayList;
 
 public class MarinaUtils {
-       /** Caution: Ivan changes the order of the ProperStopper control bits 
+       /**
+         * (Note by Bill and Adam: Ivan has struck again!)
+         * As of 05 March 2009 the new bits are:
+         *    Block Extra Fill Go Clear Silent
+         *      => Note: "Extra" gets fed to the mux in the counter
+         *         that selects the frequency output that goes off-chip
+         *
+         * Caution: Ivan changes the order of the ProperStopper control bits 
         * from chip to chip.  Here is the current order for Marina
         * as of 14 Aug 2008: 
         *  Block, Fill, Go, Silent, Clear
-        *  The old bit order for Infinity was: Fill, Block, Clear, Silent, Go */
+         *
+        *  The old bit order for Infinity was: Fill, Block, Clear, Silent, Go
+         */
     public static enum RingIfc {
-        RUN        ("00100"),//("00001"),
-        IDLE       ("10000"),//("01000"),
+        RUN        ("00100"),
+        IDLE       ("10000"),
         FILL       ("11000"),
-        BLOCK      ("10100"),//("01001"),
+        BLOCK      ("10100"),
         STOP       ("00000"),
-        CLEAR      ("10001"),//("01100"),
-        SOURCE     ("01100"),//("10001"),
-        STOPSOURCE ("01000"),//("10000"),
-        SINK       ("00110"),//("00011"),
+        CLEAR      ("10001"),
+        SOURCE     ("01100"),
+        STOPSOURCE ("01000"),
+        SINK       ("00110"),
         STOPSINK   ("00010");
         private BitVector scanBits;
         RingIfc(String bits) {scanBits = new BitVector(bits,"RingIfc");}