From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 14:27:57 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~88
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=d91c3d2c3466c2d75a4a2d9bfa9da2b43ab1e572;p=slipway.git

checkpoint
---

diff --git a/src/edu/berkeley/obits/device/atmel/ChipImpl.java b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
index 0b58130..c1b52f4 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -9,21 +9,21 @@ public class ChipImpl extends FtdiChip implements Chip {
         doReset();
     }
 
-    public void doReset() {
-        flush();
+    public boolean buffered = true;
+    public void buffered() { buffered = true; }
+    public void buffered(boolean buf) {
+        if (!buf) flush();
+        buffered = buf;
+    }
 
-        buffered(false);
+    public void doReset() {
         flush();
 
         dbangmode(dmask);
         flush();
 
         clk(false);
-        flush();
-
         data(false);
-        flush();
-
         con(false);
         flush();
 
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiChip.java b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
index 539db2a..60d84f6 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiChip.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
@@ -52,13 +52,6 @@ public class FtdiChip {
 
     protected int dbits = 0;
 
-    public boolean buffered = true;
-    public void buffered() { buffered = true; }
-    public void buffered(boolean buf) {
-        if (!buf) flush();
-        buffered = buf;
-    }
-
     protected synchronized void dbang(int bit, boolean val) {
         dbits = val ? (dbits | (1 << bit)) : (dbits & (~(1 << bit)));
         try {