From: adam <adam@megacz.com>
Date: Fri, 22 Sep 2006 02:57:29 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~48
X-Git-Url: http://git.megacz.com/?p=slipway.git;a=commitdiff_plain;h=dec534fa361f42300a30de97c6e946a2229ea0d6

checkpoint
---

diff --git a/src/com/atmel/fpslic/FpslicRawUsb.java b/src/com/atmel/fpslic/FpslicRawUsb.java
index 63842ae..534e310 100644
--- a/src/com/atmel/fpslic/FpslicRawUsb.java
+++ b/src/com/atmel/fpslic/FpslicRawUsb.java
@@ -8,6 +8,7 @@ import java.io.*;
 public class FpslicRawUsb implements FpslicRaw {
 
     private FtdiUart ftdiuart;
+    private FpslicPinsUsb pins;
 
     private int dmask =
         (1<<0) |
@@ -21,25 +22,19 @@ public class FpslicRawUsb implements FpslicRaw {
 
     public FpslicRawUsb(FtdiUart ftdiuart) throws IOException {
         this.ftdiuart = ftdiuart;
+        //this.pins = new FpslicPinsUsb(ftdiuart);
         reset();
     }
 
     public void reset() throws IOException {
 
-        dmask =
-            (1<<0) |
-            (1<<1) |
-            (1<<2) |
-            //(1<<3) |
-            //(1<<4) |
-            (1<<5) |
-            (1<<6) |
-            (1<<7);
-        ftdiuart.dbus_mode(dmask);
-
-        clearDBusLines();
+        avrrstPin(false);
+        configDataPin(false);
+        resetPin(false);
+        cclkPin(false);
+        
+        conPin(false);
         flush();
-        ftdiuart.dbus_mode(dmask);
 
         resetPin(false);
         try { Thread.sleep(500); } catch (Exception e) { }
@@ -76,9 +71,7 @@ public class FpslicRawUsb implements FpslicRaw {
                     flush();
 
                     // turn off the CON pin we've been pulling low...
-                    dmask &= ~(1<<0);
-                    ftdiuart.dbus_mode(dmask);
-                    flush();
+                    releaseConPin();
 
                     if (!initPin())
                         throw new RuntimeException("initialization failed at " + bytes);
@@ -186,6 +179,19 @@ public class FpslicRawUsb implements FpslicRaw {
         }
     }
 
+    private void releaseConPin() throws IOException {
+        dmask &= ~(1<<0);
+        ftdiuart.dbus_mode(dmask);
+        flush();
+    }
+
+    private void conPin(boolean on) throws IOException {
+        dmask |= (1<<0);
+        ftdiuart.dbus_mode(dmask);
+        setDBusLine(0, on);
+        flush();
+    }
+
     private void avrrstPin(boolean on) throws IOException { setDBusLine(7, on); }
     private void cclkPin(boolean on)    throws IOException { setDBusLine(6, on); }
     private void configDataPin(boolean on)   throws IOException { setDBusLine(5, on); }