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

[fleet.git] / src / com / sun / vlsi / chips / marina / test / MarinaTest.java

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;