X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fslipway%2FFtdiBoard.java;h=cf2cfd7f0d4c8a80b65991fcfef726debb9c72a0;hb=dfa9f65eb0614beb6fe0d7e7660a300087fc656d;hp=9758540a5cdbf48a24c2232826f098a9e846f92b;hpb=304b5fd54ac37294709cf761e5d69b8731b878a8;p=slipway.git

diff --git a/src/edu/berkeley/slipway/FtdiBoard.java b/src/edu/berkeley/slipway/FtdiBoard.java
index 9758540..cf2cfd7 100644
--- a/src/edu/berkeley/slipway/FtdiBoard.java
+++ b/src/edu/berkeley/slipway/FtdiBoard.java
@@ -32,14 +32,12 @@ public class FtdiBoard extends Fpslic implements Board {
         out = new DataOutputStream(chip.getOutputStream());
         for(int i=0; i<255; i++) out.write(0);
         out.flush();
+        init();
     }
 
-    public void reset() throws IOException {
-        chip.reset();
-    }
+    public void reset() throws IOException { chip.reset(); }
 
     public void boot(Reader r) throws Exception {
-
         chip.selfTest();
 
         int total = 75090/9;
@@ -57,11 +55,6 @@ public class FtdiBoard extends Fpslic implements Board {
         os.close();
     }
 
-    public static String pad(String s, int i) {
-        if (s.length() >= i) return s;
-        return "0"+pad(s, i-1);
-    }
-
 
     // AvrDrone leftovers //////////////////////////////////////////////////////////////////////////////
 
@@ -84,129 +77,129 @@ public class FtdiBoard extends Fpslic implements Board {
                 bytes[3] == (byte)'T' &&
                 bytes[4] == (byte)'S') {
                 System.out.println("\rsignature: got proper signature                  ");
+                chip.purge();
                 break;
             }
         }
 
-    }
-
-    public synchronized void scanFPGA(boolean on) throws IOException {
-        if (on) {
-            out.writeByte(3);
-            out.flush();
-        } else {
-            // FIXME
-        }
-    }
-    // fixme!
-    public static int retval = 0;
-    public synchronized int readCount() {
-        try {
-            if (reader != null) {
-                reader.start();
-                reader = null;
-            }
-            ByteCallback bc = new ByteCallback() {
-                    public synchronized void call(byte b) throws Exception {
-                        retval =
-                            ((b & 0xff) << 24) |
-                            ((in.read() & 0xff) << 16) |
-                            ((in.read() & 0xff) << 8) |
-                            ((in.read() & 0xff) << 0);
-                        this.notify();
-                    }
-                };
-            synchronized(bc) {
-                callbacks.add(bc);
-                out.writeByte(6);
-                out.flush();
-                bc.wait();
-            }
-            return retval;
-        } catch (Exception e) { throw new RuntimeException(e); }
-    }
-
-    public static interface ByteCallback {
-        public void call(byte b) throws Exception;
-    }
-
-    private Vector callbacks = new Vector();
-
-    private Thread reader = new Thread() {
+        // FIXME: what if init() is called twice?
+        new Thread() {
             public void run() {
-                System.out.println("*** reader thread begun");
                 while(true) {
                     try {
+                        while(callbacks.size() == 0) Thread.sleep(500);
                         byte b = in.readByte();
                         ByteCallback bc = (ByteCallback)callbacks.remove(0);
+                        //System.out.println("readback " + b + " in " + (System.currentTimeMillis()-bc.time));
                         bc.call(b);
+                        synchronized(lock) {
+                            lock.notifyAll();
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                 }
             }
-        };
-
-    public synchronized void readBus(ByteCallback bc) throws IOException {
-        callbacks.add(bc);
-        out.writeByte(2);
-        out.flush();
-        if (reader != null) {
-            reader.start();
-            reader = null;
-        }
+        }.start();
     }
 
-    public synchronized void readInterrupts(ByteCallback bc) throws IOException {
-        callbacks.add(bc);
-        out.writeByte(6);
-        out.flush();
-        if (reader != null) {
-            reader.start();
-            reader = null;
-        }
-    }
+
+    // Programming ///////////////////////////////////////////////////////////////////////////////
 
     private byte[][][] cache = new byte[24][][];
-    public /*synchronized*/ byte mode4(int z, int y, int x) {
+    public byte mode4(int z, int y, int x) {
         if (cache[x]==null) return 0;
         if (cache[x][y]==null) return 0;
         return cache[x][y][z];
     }
 
-    int lastz = 0;
-    int lastx = 0;
-    int lasty = 0;
-    public static int save = 0;
-    public static int saveof = 0;
-    public /*synchronized*/ void mode4(int z, int y, int x, int d) {
+    public synchronized void mode4(int z, int y, int x, int d) {
         try {
+            if (cache[x & 0xff]==null) cache[x & 0xff] = new byte[24][];
+            if (cache[x & 0xff][y & 0xff]==null) cache[x & 0xff][y & 0xff] = new byte[256];
+            cache[x & 0xff][y & 0xff][z & 0xff] = (byte)(d & 0xff);
+
             out.writeByte(1);
             out.writeByte(z);
             out.writeByte(y);
             out.writeByte(x);
-            saveof++;
-            lastz = z;
-            lastx = x;
-            lasty = y;
             out.writeByte(d);
-
-            if (cache[x & 0xff]==null) cache[x & 0xff] = new byte[24][];
-            if (cache[x & 0xff][y & 0xff]==null) cache[x & 0xff][y & 0xff] = new byte[256];
-            cache[x & 0xff][y & 0xff][z & 0xff] = (byte)(d & 0xff);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public /*synchronized*/ void flush() {
-        try {
-            out.flush();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+    public void flush() { try { out.flush(); } catch (IOException e) { throw new RuntimeException(e); } }
+
+
+    // Callbacks //////////////////////////////////////////////////////////////////////////////
+
+    private Vector callbacks = new Vector();
+
+    private Object lock = new Object();
+    private static final int limit = 40;
+
+    private void enqueue(ByteCallback bcb) {
+        synchronized(lock) {
+            try {
+                while (callbacks.size() >= limit) {
+                    lock.wait(100);
+                }
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
         }
+        bcb.time = System.currentTimeMillis();
+        callbacks.add(bcb);
+    }
+
+    public static abstract class ByteCallback {
+        public int result;
+        public long time;
+        public abstract void call(byte b) throws Exception;
     }
 
+    public synchronized int readCount() {
+        try {
+            ByteCallback bc = new ByteCallback() {
+                    public synchronized void call(byte b) throws Exception {
+                        result =
+                            ((b & 0xff) << 24) |
+                            ((in.read() & 0xff) << 16) |
+                            ((in.read() & 0xff) << 8) |
+                            ((in.read() & 0xff) << 0);
+                        this.notify();
+                    }
+                };
+            synchronized(bc) {
+                enqueue(bc);
+                out.writeByte(3);
+                out.flush();
+                bc.wait();
+            }
+            return bc.result;
+        } catch (Exception e) { throw new RuntimeException(e); }
+    }
+
+    public synchronized void readBus(ByteCallback bc) throws IOException {
+        enqueue(bc);
+        out.writeByte(2);
+        out.flush();
+    }
+
+    public synchronized void readInterrupts(ByteCallback bc) throws IOException {
+        enqueue(bc);
+        out.writeByte(3);
+        out.flush();
+    }
+
+
+    // Util //////////////////////////////////////////////////////////////////////////////
+
     private String pad(int i, String s) { if (s.length()>i) return s; return "0"+pad((i-1),s); }
+    public static String pad(String s, int i) {
+        if (s.length() >= i) return s;
+        return "0"+pad(s, i-1);
+    }
 
 }