X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fcom%2Fsun%2Fvlsi%2Fchips%2Fmarina%2Ftest%2FMarinaTest.java;h=192a109f24442afa78b4274e62fae8e97c3b158d;hb=0427ed71262e9a8d461285b5f18adf9149a65d97;hp=42e3486389f223a0dab7b453e6d5ca9d4fbd572e;hpb=74c0578c820fde83bddd777a5474c7efc9684e09;p=fleet.git

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java b/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 42e3486..192a109 100644
--- a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -234,7 +234,7 @@ public class MarinaTest {
             : cmdArgs.jtagShift
             ? 20000
             : model instanceof ChipModel
-            ? 1
+            ? 1000
             : 1000000;
 
         System.err.println("constructing jtag controller");
@@ -242,6 +242,15 @@ public class MarinaTest {
             model instanceof SimulationModel
             ? ((SimulationModel)model).createJtagTester("TCK", "TMS", "TRSTb", "TDI", "TDO")
             : new Netscan4("jtag3", 2);
+        if (tester instanceof Netscan4) {
+            ((Netscan4)tester).reset();
+            // master clear
+            // not sure if "GPIO1" means "index 0" or not
+            JtagLogicLevel mc0 = new JtagLogicLevel(tester, 0);
+            JtagLogicLevel mc1 = new JtagLogicLevel(tester, 1);
+            mc0.setLogicState(true);
+            mc1.setLogicState(true);
+        }
         Logger.setLogInits(true);
         tester.setLogSets(true);
         tester.setLogOthers(true);