get rid of ChainControls

[fleet.git] / src / edu / berkeley / fleet / marina / MarinaTest.java

diff --git a/src/edu/berkeley/fleet/marina/MarinaTest.java b/src/edu/berkeley/fleet/marina/MarinaTest.java
index 23e48ef..1d279aa 100644 (file)
--- a/src/edu/berkeley/fleet/marina/MarinaTest.java
+++ b/src/edu/berkeley/fleet/marina/MarinaTest.java
@@ -246,7 +246,6 @@ public class MarinaTest {
         */
         tester.printInfo = false;
 
-        ChainControls ccs = new ChainControls();
         PowerChannel pc = new ManualPowerChannel("pc", false);
         /*
           JtagTester testerD, testerR, testerC;
@@ -282,12 +281,8 @@ public class MarinaTest {
         cc = new ChainControl(SCAN_CHAIN_XML, tester, 1.8f, khz);
         cc.noTestSeverity = Infrastructure.SEVERITY_NOMESSAGE;
         ct = new ChainTest(cc, pc);
-        ccs.addChain(Marina.DATA_CHAIN, cc);
-        ccs.addChain(Marina.REPORT_CHAIN, cc);
-        ccs.addChain(Marina.CONTROL_CHAIN, cc);
-        ccs.addChain(Marina.DUKE_CHAIN, cc);
 
-        marina = new Marina(ccs, model, !cmdArgs.jtagShift, indenter);
+        marina = new Marina(cc, cc, cc, cc, model, !cmdArgs.jtagShift, indenter);
         marina.mc0=mc0;
         marina.mc1=mc1;
 
@@ -2465,7 +2460,7 @@ public class MarinaTest {
             case 3040: loadEveryValueOLC(marina); break;
             case 6666: {
                 SubchainNode chainNode =
-                    (SubchainNode)marina.cc.getChainControlFromPath(Marina.DUKE_CHAIN)
+                    (SubchainNode)marina.dukeChain
                     .findNode("marina.duke.marinaGu@0.dukeAll@1.dukePart@0.ring37sW@1.scanner@0.scanFx1@1.scanCell@3");
                 int bitIndex = chainNode.getBitIndex();
                 ChainNode root = chainNode.getParentChain();