MarinaTest: if using jtagShift, limit frequency to 20Mhz

diff --git a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
index 9a5df19..8f2156f 100644 (file)
--- a/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/marina/testCode/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -222,10 +222,12 @@ public class MarinaTest {
         ((SimulationModel)model).setOptimizedDirectReadsWrites(true);
 
         CYCLE_TIME_NS = cmdArgs.useVerilog ? (100*20) : 0.250;
-        int khz   = model instanceof VerilogModel ?  100000 : 1000000;
+        int khz   = model instanceof VerilogModel ? 100000 : cmdArgs.jtagShift ? 20000 : 1000000;
 
+        prln("constructing jtag controller");
         JtagTester tester = ((SimulationModel)model).createJtagTester("TCK", "TMS", "TRSTb", "TDI", "TDO");
         tester.printInfo = false;
+
         ChainControls ccs = new ChainControls();
         PowerChannel pc = new ManualPowerChannel("pc", false);
         /*