change com.sun.async.test -> com.sun.electric.tool.simulation.test

diff --git a/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java b/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java
index 3ef73a1..040b773 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java
+++ b/src/com/sun/vlsi/chips/marina/test/BitVectorGenerators.java
@@ -1,6 +1,5 @@
 package com.sun.vlsi.chips.marina.test;
-import com.sun.async.test.BitVector;
-import com.sun.async.test.Infrastructure;
+import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
 import java.util.Random;

diff --git a/src/com/sun/vlsi/chips/marina/test/ChainControls.java b/src/com/sun/vlsi/chips/marina/test/ChainControls.java
index f1bfd14..dc784ad 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/ChainControls.java
+++ b/src/com/sun/vlsi/chips/marina/test/ChainControls.java
@@ -2,9 +2,7 @@ package com.sun.vlsi.chips.marina.test;
 
 import java.util.HashMap;
 import java.util.Map;
-
-import com.sun.async.test.BitVector;
-import com.sun.async.test.ChainControl;
+import com.sun.electric.tool.simulation.test.*;
 
 /** One or more ChainControl. If we have a JTAG controller then one
  * ChainControl. If we don't have a JTAG controller then we need

diff --git a/src/com/sun/vlsi/chips/marina/test/CmdArgs.java b/src/com/sun/vlsi/chips/marina/test/CmdArgs.java
index 05ecd4a..a79a275 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/CmdArgs.java
+++ b/src/com/sun/vlsi/chips/marina/test/CmdArgs.java
@@ -1,6 +1,5 @@
 package com.sun.vlsi.chips.marina.test;
-import com.sun.async.test.BitVector;
-import com.sun.async.test.Infrastructure;
+import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
 import java.util.Random;

diff --git a/src/com/sun/vlsi/chips/marina/test/Counter.java b/src/com/sun/vlsi/chips/marina/test/Counter.java
index f39363e..029e4ee 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Counter.java
+++ b/src/com/sun/vlsi/chips/marina/test/Counter.java
@@ -1,5 +1,6 @@
 package com.sun.vlsi.chips.marina.test;
-import com.sun.async.test.ChainControl;
+import com.sun.electric.tool.simulation.test.*;
+
 
 /**
  *  An item-counter which counts items that pass by in one of the

diff --git a/src/com/sun/vlsi/chips/marina/test/Design.java b/src/com/sun/vlsi/chips/marina/test/Design.java
index 218d1d4..3fe9cf5 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Design.java
+++ b/src/com/sun/vlsi/chips/marina/test/Design.java
@@ -1,6 +1,6 @@
 package com.sun.vlsi.chips.marina.test;
 
-import com.sun.async.test.JtagTester;
+import com.sun.electric.tool.simulation.test.*;
 
 public interface Design {
     public void masterClear(JtagTester tester);

diff --git a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java b/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java
index d8192f9..bb200e2 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java
+++ b/src/com/sun/vlsi/chips/marina/test/InstructionStopper.java
@@ -3,9 +3,7 @@ package com.sun.vlsi.chips.marina.test;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.async.test.BitVector;
-import com.sun.async.test.ChainControl;
-import com.sun.async.test.ChipModel;
+import com.sun.electric.tool.simulation.test.*;
 
 import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.api.Instruction;

diff --git a/src/com/sun/vlsi/chips/marina/test/Marina.java b/src/com/sun/vlsi/chips/marina/test/Marina.java
index 5aa6dae..e0ace7d 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Marina.java
+++ b/src/com/sun/vlsi/chips/marina/test/Marina.java
@@ -1,12 +1,6 @@
 package com.sun.vlsi.chips.marina.test;
 /* -*- tab-width: 4 -*- */
-import com.sun.async.test.BitVector;
-import com.sun.async.test.ChainControl;
-import com.sun.async.test.ChipModel;
-import com.sun.async.test.JtagTester;
-import com.sun.async.test.NanosimModel;
-import com.sun.async.test.VerilogModel;
-import com.sun.async.test.*;
+import com.sun.electric.tool.simulation.test.*;
 
 import edu.berkeley.fleet.api.Instruction;
 import edu.berkeley.fleet.marina.MarinaPath;

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java b/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java
index b14ef86..90f108e 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java
+++ b/src/com/sun/vlsi/chips/marina/test/MarinaPacket.java
@@ -1,10 +1,6 @@
 package com.sun.vlsi.chips.marina.test;
 /* -*- tab-width: 4 -*- */
-import com.sun.async.test.BitVector;
-import com.sun.async.test.ChainControl;
-import com.sun.async.test.ChipModel;
-import com.sun.async.test.JtagTester;
-import com.sun.async.test.NanosimModel;
+import com.sun.electric.tool.simulation.test.*;
 import edu.berkeley.fleet.api.Dock;
 import edu.berkeley.fleet.api.Instruction;
 import edu.berkeley.fleet.marina.MarinaFleet;

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java b/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
index b712057..f2d78bc 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
+++ b/src/com/sun/vlsi/chips/marina/test/MarinaTest.java
@@ -3,26 +3,7 @@ package com.sun.vlsi.chips.marina.test;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.sun.async.test.BitVector;
-import com.sun.async.test.ChainControl;
-import com.sun.async.test.ChainG;
-import com.sun.async.test.ChainTest;
-import com.sun.async.test.ChipModel;
-import com.sun.async.test.HP34401A;
-import com.sun.async.test.Infrastructure;
-import com.sun.async.test.JtagSubchainTesterModel;
-import com.sun.async.test.JtagTester;
-import com.sun.async.test.ManualPowerChannel;
-import com.sun.async.test.NanosimModel;
-import com.sun.async.test.NanosimLogicSettable;
-import com.sun.async.test.HsimModel;
-import com.sun.async.test.VerilogModel;
-import com.sun.async.test.Netscan4;
-import com.sun.async.test.PowerChannel;
-import com.sun.async.test.Pst3202Channel;
-import com.sun.async.test.SiliconChip;
-import com.sun.async.test.SimulationModel;
-import com.sun.async.test.VoltageReadable;
+import com.sun.electric.tool.simulation.test.*;
 import com.sun.vlsi.chips.marina.test.Marina.Ilc;
 import com.sun.vlsi.chips.marina.test.CmdArgs;
 import com.sun.vlsi.chips.marina.test.CmdArgs.Mode;
@@ -34,7 +15,6 @@ import edu.berkeley.fleet.api.Instruction.Set.SetDest;
 import edu.berkeley.fleet.api.Instruction.Set.SetSource;
 import edu.berkeley.fleet.marina.MarinaFleet;
 import edu.berkeley.fleet.marina.MarinaPath;
-import com.sun.async.test.*;
 
 import java.io.*;
 
@@ -120,6 +100,8 @@ public class MarinaTest {
     private PowerChannel corePowerSupply, padsPowerSupply;
     private VoltageReadable coreVoltmeter, voltmeterForCurrent;
 
+
+
     private ChainTest ctD, ctR, ctC, ct;
     private ChainControl ccD, ccR, ccC, cc;
         

diff --git a/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java b/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java
index 02b7fcc..8a8ca2b 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java
+++ b/src/com/sun/vlsi/chips/marina/test/MarinaUtils.java
@@ -1,6 +1,5 @@
 package com.sun.vlsi.chips.marina.test;
-import com.sun.async.test.BitVector;
-import com.sun.async.test.Infrastructure;
+import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
 import java.util.Random;

diff --git a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
index 46151fa..d349aa0 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
+++ b/src/com/sun/vlsi/chips/marina/test/ProperStopper.java
@@ -1,8 +1,7 @@
 package com.sun.vlsi.chips.marina.test;
+import com.sun.electric.tool.simulation.test.*;
 import java.util.ArrayList;
 import java.util.List;
-
-import com.sun.async.test.*;
 import com.sun.vlsi.chips.marina.test.MarinaUtils.StateWireState;
 
 public class ProperStopper {

diff --git a/src/com/sun/vlsi/chips/marina/test/Station.java b/src/com/sun/vlsi/chips/marina/test/Station.java
index 5f9ed62..112c33c 100644 (file)
--- a/src/com/sun/vlsi/chips/marina/test/Station.java
+++ b/src/com/sun/vlsi/chips/marina/test/Station.java
@@ -1,6 +1,5 @@
 package com.sun.vlsi.chips.marina.test;
-import com.sun.async.test.BitVector;
-import com.sun.async.test.Infrastructure;
+import com.sun.electric.tool.simulation.test.*;
 
 import java.util.List;
 import java.util.Random;