cleaned up, plus added new scanM:scanAmp passthrough definition

diff --git a/testCode/marina.bsh b/testCode/marina.bsh
index ce05bf2..4a6db88 100644 (file)
--- a/testCode/marina.bsh
+++ b/testCode/marina.bsh
@@ -5,7 +5,7 @@ import com.sun.electric.plugins.menus.ScanChainXML;
 /*
  * Create a ScanChainXML object
  */
-
+  
   ScanChainXML gen = new ScanChainXML();
 
   // Add all the scan chain elements: name, access, clears, 
@@ -14,28 +14,24 @@ import com.sun.electric.plugins.menus.ScanChainXML;
   // data out bar port name (may be "" or null).
   // Both data out and data out bar must be specified or left out.
 
-  gen.addScanChainElement("scanJ", "scanCellE", "RW", "-", "sin", "sout", "dIn[1](R)", "latch2in@0.dataBar(WI)");
-  gen.addScanChainElement("scanJ", "scanCellF", "RW", "L", "sin", "sout", "dout[1](R)", "latch2in@1.dataBar(WI)");
   gen.addScanChainElement("scanK", "scanCellKh", "R", "-", "sin", "sout", "din[1](R)", "");
   gen.addScanChainElement("countersL", "cntScnOne", "RW", "-", "sin", "out", "out(R)", "latch2in@0.dataBar(WI)");
 
   gen.addScanChainElement("scanM", "scanCellE", "RW", "-", "sin", "sout", "dIn[1](R)", "latch2in@0.dataBar(WI)");
   gen.addScanChainElement("scanM", "scanCellF", "RW", "L", "sin", "sout", "dout[1](R)", "latch2in@1.dataBar(WI)");
 
-  //gen.addScanChainElement("latchGroupsK", "latchWscan", "RW", "-", "sin", "sout", "scanCell@2.latch2in@0.dataBar(WI)", "out[1](R)");
-  //gen.addScanChainElement("latchGroupsK", "latchWscan", "RW", "-", "sin", "sout", "hi2inLat@1.dataBar(WI)", "out[1](R)");
-
-  //gen.addScanChainElement("scanF", "iScanShift", "R", "-", "sdin", "sdout", "rddata(RI)", "");
-
   // Add all the pass through elements: these pass scan data through,
   // like inverters or buffers
-  gen.addPassThroughCell("scanJ", "scanAmp", "in[1]", "out[1]");
+
+  gen.addPassThroughCell("scanM", "scanAmp", "in[1]", "out[1]");
 
   // Define the jtag controller by it's library, cell name,
   // and the number of instruction register bits
+
   gen.setJtagController("jtagController", "jtagCentral{sch}", 8);
 
   // Chip-specific configuration
+
   gen.setChipName("marina");
 
    // gen.addJtagPort(1, "leaf0[1]", "leaf0[8]", "jtag_lvds");