checkpoint

[slipway.git] / src / com / atmel / fpslic / FpslicRawUsb.java

diff --git a/src/com/atmel/fpslic/FpslicRawUsb.java b/src/com/atmel/fpslic/FpslicRawUsb.java
index ca3737e..61b687b 100644 (file)
--- a/src/com/atmel/fpslic/FpslicRawUsb.java
+++ b/src/com/atmel/fpslic/FpslicRawUsb.java
@@ -35,19 +35,12 @@ public class FpslicRawUsb implements FpslicRaw {
             (1<<5) |
             (1<<6) |
             (1<<7);
-        avrrst(false);
-
-        flush();
-        //purge();
-
         ftdiuart.dbus_mode(dmask);
-        flush();
 
+        avrrst(false);
         clk(false);
         data(false);
         con(false);
-        flush();
-        //try { Thread.sleep(500); } catch (Exception e) { }
 
         reset(false);
         flush();
@@ -64,16 +57,16 @@ public class FpslicRawUsb implements FpslicRaw {
 
     public OutputStream getConfigStream() throws IOException {
         reset();
-        config(0,3);
-        con();
-        config(0,7);
+        config(0,2);
         flush();
         return new OutputStream() {
                 int bytes = 0;
                 int bits = 0;
                 public void write(int in) throws IOException {
                     for(int i=7; i>=0; i--) {
+                        bits++;
                         config((((in & 0xff) & (1<<i))!=0)?1:0, 1);
+                        if (bits==1) con();
                     }
                 }
                 public void write(byte[] b, int off, int len) throws IOException {
@@ -114,6 +107,9 @@ public class FpslicRawUsb implements FpslicRaw {
         boolean pin;
 
         getConfigStream();
+        config(0,1);
+        con();
+        config(0,7);
         config(Integer.parseInt("10110111", 2), 8);
         config(0,1);
         flush();
@@ -121,13 +117,11 @@ public class FpslicRawUsb implements FpslicRaw {
         pin = initErr();
         System.out.println("good preamble   => " + pin + " " + (pin ? green("good") : red("BAD")));
 
-        reset();
-        try { Thread.sleep(100); } catch (Exception e) { }
-        config(0,3);
+        getConfigStream();
+        config(0,1);
         con();
         config(0,6);
         flush();
-        // one too many
         config(Integer.parseInt("10110111", 2), 8);
         config(0, 2);
         flush();
@@ -135,9 +129,10 @@ public class FpslicRawUsb implements FpslicRaw {
         pin = initErr();
         System.out.println("bad preamble #2 => " + pin + " " + (pin ? red("BAD") : green("good")));
 
-        reset();
-        try { Thread.sleep(100); } catch (Exception e) { }
         getConfigStream();
+        config(0,1);
+        con();
+        config(0,7);
         config(Integer.parseInt("11110111", 2), 8);
         config(0, 1);
         flush();
@@ -163,7 +158,7 @@ public class FpslicRawUsb implements FpslicRaw {
             boolean bit = (dat & (1<<i)) != 0;
             data(bit);
             clk(true);
-            clk(false);
+            dbits &= ~(1<<6);  // let the clock fall with the next data bit, whenever it goes out
         }
     }