From: adam <adam@megacz.com>
Date: Wed, 20 Sep 2006 08:48:45 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~74
X-Git-Url: http://git.megacz.com/?p=slipway.git;a=commitdiff_plain;h=10b33f2888bcd7dd97f8a8ef84b9e63f0694e4c3

checkpoint
---

diff --git a/src/com/atmel/fpslic/ChipImpl.java b/src/com/atmel/fpslic/ChipImpl.java
index 157393d..66557fa 100644
--- a/src/com/atmel/fpslic/ChipImpl.java
+++ b/src/com/atmel/fpslic/ChipImpl.java
@@ -73,14 +73,9 @@ public class ChipImpl extends FtdiUart implements Chip {
     //         we can pull it down (assert reset) from uart-mode, or we can
     //         let it float upward from either mode.
     public void reset(boolean on) {
-        bits = on ? (1<<1) : 0;
-        mask = (1<<1);
-        uart();
+        uart(1<<1, on ? (1<<1) : 0);
         flush();
         if (on) {
-            //mask = 0;
-            //uart();
-            //flush();
             dbangmode(dmask);
             flush();
         }
diff --git a/src/com/ftdi/usb/FtdiUart.java b/src/com/ftdi/usb/FtdiUart.java
index e864914..026ac9e 100644
--- a/src/com/ftdi/usb/FtdiUart.java
+++ b/src/com/ftdi/usb/FtdiUart.java
@@ -41,7 +41,6 @@ public class FtdiUart {
     public synchronized void purge() {
         example.ftdi_usb_purge_buffers(context);
     }
-    public synchronized void uart() { uart(mask, bits); }
     public synchronized void uart(int mask, int bits) {
         example.ftdi_set_bitmode(context, (short)((mask << 4) | bits), (short)0x20);
         //example.ftdi_setflowctrl(context, (1 << 8));
diff --git a/src/edu/berkeley/slipway/FtdiBoard.java b/src/edu/berkeley/slipway/FtdiBoard.java
index 962ddce..885aa11 100644
--- a/src/edu/berkeley/slipway/FtdiBoard.java
+++ b/src/edu/berkeley/slipway/FtdiBoard.java
@@ -135,7 +135,7 @@ public class FtdiBoard extends Board {
 
         //System.out.println("avr reset => true");
         chip.purge();
-        chip.uart();
+        chip.uart(1<<1, 1<<1);
         
         //d.avrrst(true);
         //try { Thread.sleep(500); } catch (Exception e) { }