X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fslipway%2FFtdiBoard.java;h=7c83724300f3a6e37eca2b9c78b0a1c3ccb7ed31;hb=57f6ad104a6e2bf0433a86f5c8e1f31c1715dab9;hp=42779937d491d98fa5941f98f77c732622e75e7d;hpb=f6099b976e2007f794cbec45c5175d4e49aa1c1b;p=slipway.git

diff --git a/src/edu/berkeley/slipway/FtdiBoard.java b/src/edu/berkeley/slipway/FtdiBoard.java
index 4277993..7c83724 100644
--- a/src/edu/berkeley/slipway/FtdiBoard.java
+++ b/src/edu/berkeley/slipway/FtdiBoard.java
@@ -22,6 +22,7 @@ public class FtdiBoard extends Fpslic implements Board {
     public OutputStream getOutputStream() { return out; }
 
     public FtdiBoard() throws Exception {
+        super(24, 24);
         chip = new FpslicBoot(new FpslicBootPinsUsb(new FtdiUart(0x6666, 0x3133, 1500 * 1000)));
         String bstFile = this.getClass().getName();
         bstFile = bstFile.substring(0, bstFile.lastIndexOf('.'));
@@ -31,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;
@@ -56,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 //////////////////////////////////////////////////////////////////////////////
 
@@ -87,27 +81,66 @@ public class FtdiBoard extends Fpslic implements Board {
             }
         }
 
+        // FIXME: what if init() is called twice?
+        new Thread() {
+            public void run() {
+                while(true) {
+                    try {
+                        while(callbacks.size() == 0) Thread.sleep(500);
+                        byte b = in.readByte();
+                        ByteCallback bc = (ByteCallback)callbacks.remove(0);
+                        bc.call(b);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }.start();
     }
 
-    public synchronized void scanFPGA(boolean on) throws IOException {
-        if (on) {
-            out.writeByte(3);
-            out.flush();
-        } else {
-            // FIXME
+
+    // Programming ///////////////////////////////////////////////////////////////////////////////
+
+    private byte[][][] cache = new byte[24][][];
+    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];
+    }
+
+    public 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);
+            out.writeByte(d);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
         }
     }
-    // fixme!
-    public static int retval = 0;
+
+    public void flush() { try { out.flush(); } catch (IOException e) { throw new RuntimeException(e); } }
+
+
+    // Callbacks //////////////////////////////////////////////////////////////////////////////
+
+    private Vector callbacks = new Vector();
+
+    public static abstract class ByteCallback {
+        public int result;
+        public abstract void call(byte b) throws Exception;
+    }
+
     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 =
+                        result =
                             ((b & 0xff) << 24) |
                             ((in.read() & 0xff) << 16) |
                             ((in.read() & 0xff) << 8) |
@@ -117,95 +150,33 @@ public class FtdiBoard extends Fpslic implements Board {
                 };
             synchronized(bc) {
                 callbacks.add(bc);
-                out.writeByte(6);
+                out.writeByte(3);
                 out.flush();
                 bc.wait();
             }
-            return retval;
+            return bc.result;
         } 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() {
-            public void run() {
-                System.out.println("*** reader thread begun");
-                while(true) {
-                    try {
-                        byte b = in.readByte();
-                        ByteCallback bc = (ByteCallback)callbacks.remove(0);
-                        bc.call(b);
-                    } 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;
-        }
     }
 
     public synchronized void readInterrupts(ByteCallback bc) throws IOException {
         callbacks.add(bc);
-        out.writeByte(6);
+        out.writeByte(3);
         out.flush();
-        if (reader != null) {
-            reader.start();
-            reader = null;
-        }
     }
 
-    private byte[][][] cache = new byte[24][][];
-    public /*synchronized*/ 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) {
-        try {
-            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);
-        }
-    }
+    // 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);
+    }
 
 }