From: Adam Megacz <adam.megacz@sun.com>
Date: Tue, 10 Mar 2009 22:20:10 +0000 (+0000)
Subject: make drainNoCheck() protected, not private
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c27f76c2163d19dc100877d3f508b0efee73ee9f;p=fleet.git

make drainNoCheck() protected, not private
---

diff --git a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
index cd5a182..2a304c0 100644
--- a/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
+++ b/testCode/com/sun/vlsi/chips/marina/test/ProperStopper.java
@@ -61,12 +61,7 @@ public class ProperStopper {
         }
         return sb.toString();
     }
-
-    private BitVector getDatTokAdr() {
-        // strip the two write enable bits
-        return cc.getOutBits(dataPath).get(2, 52);
-    }
-    
+  
     private void shiftControl(boolean readEnable, boolean writeEnable) {
         cc.shift(controlChain, readEnable, writeEnable);
     }
@@ -309,9 +304,11 @@ public class ProperStopper {
      * Assume that an item is available. 
      * entry state: stop
      * exit state: stop */
-    private BitVector drainNoCheck() {
+    protected BitVector drainNoCheck() {
         shiftData(true, false);
-        BitVector ans = getDatTokAdr();
+
+        // strip the two write enable bits
+        BitVector ans = cc.getOutBits(dataPath).get(2, 52);
 
         idle();                                 // block = 1
         clear();                                // clear = 1