From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 13:37:44 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~98
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8ebad3793f9372a389c1904b461debd8add2d853;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 677bf5f..5cb10ec 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -40,8 +40,6 @@ public class ChipImpl extends FtdiChip implements Chip {
 
     //
 
-    public void buffered() { buffered = true; }
-    public void buffered(boolean buf) { buffered = buf; }
     public void config(boolean bit) { config(bit?1:0, 1); }
     public void config(int dat) { config(dat, 8); }
     public void config(int dat, int numbits) {
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiChip.java b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
index 94d860f..20f4a2a 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiChip.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
@@ -34,7 +34,6 @@ public class FtdiChip {
         } catch (IOException e) { throw new RuntimeException(e); }
     }
 
-    public boolean buffered = false;
     protected static int mask =
         (1<<0) |
         (1<<1)// |
@@ -54,16 +53,17 @@ public class FtdiChip {
     }
 
     protected int dbits = 0;
+
+    public boolean buffered = false;
+    public void buffered() { buffered = true; }
+    public void buffered(boolean buf) { buffered = buf; }
+
     protected synchronized void dbang(int bit, boolean val) {
         dbits = val ? (dbits | (1 << bit)) : (dbits & (~(1 << bit)));
-        if (buffered) {
-            baos.write((byte)dbits);
-        } else {
-            try {
-                out.write((byte)dbits);
-                out.flush();
-            } catch (IOException e) { throw new RuntimeException(e); }
-        }
+        try {
+            out.write((byte)dbits);
+            if (!buffered) out.flush();
+        } catch (IOException e) { throw new RuntimeException(e); }
     }