From 88262b67660010569acf55be49e3d5f88f73bfba Mon Sep 17 00:00:00 2001 From: megacz Date: Sun, 3 May 2009 16:27:16 -0700 Subject: [PATCH] remove extraneous classes --- src/com/atmel/fpslic/FpslicNetgraph.java | 42 ----------------------------- src/edu/berkeley/slipway/Board.java | 22 --------------- src/edu/berkeley/slipway/FakeBoard.java | 2 +- src/edu/berkeley/slipway/SerialBoard.java | 2 +- 4 files changed, 2 insertions(+), 66 deletions(-) delete mode 100644 src/com/atmel/fpslic/FpslicNetgraph.java delete mode 100644 src/edu/berkeley/slipway/Board.java diff --git a/src/com/atmel/fpslic/FpslicNetgraph.java b/src/com/atmel/fpslic/FpslicNetgraph.java deleted file mode 100644 index 81164c9..0000000 --- a/src/com/atmel/fpslic/FpslicNetgraph.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.atmel.fpslic; - -/** a higher-level, lower-performance, write-only API */ -public class FpslicNetgraph { - /* - public interface Net { - } - - public interface Mux extends Net { - } - - public interface PassGate { - } - - public class Cell { - public Cell north() { return cell(col,row+1); } - public Cell south() { return cell(col,row-1); } - public Cell west() { return cell(col-1,row); } - public Cell east() { return cell(col+1,row); } - public Cell ne() { return cell(col+1,row+1); } - public Cell se() { return cell(col+1,row-1); } - public Cell nw() { return cell(col-1,row+1); } - public Cell sw() { return cell(col-1,row-1); } - - public Net xi = new XI(new Net[] { wire(0), wire(1), wire(2), wire(3), wire(4), - nw().xo, ne().xo, sw().xo, se().xo - }); - public Net yi = new YI(new Net[] { wire(0), wire(1), wire(2), wire(3), wire(4), - north().yo, south().yo, east().yo, west().yo - }); - public Net wi = new WI(new Net[] { wire(0), wire(1), wire(2), wire(3), wire(4) }); - public Net zi = new ZI(new Net[] { wire(0), wire(1), wire(2), wire(3), wire(4) }); - - public Net cmux = new CMux(); - public Net ylut = new YLut(); - public Net xlut = new XLut(); - public Net yo = new Yo(); - public Net xo = new Xo(); - public Net register = new Register(); - } - */ -} diff --git a/src/edu/berkeley/slipway/Board.java b/src/edu/berkeley/slipway/Board.java deleted file mode 100644 index 33e2eff..0000000 --- a/src/edu/berkeley/slipway/Board.java +++ /dev/null @@ -1,22 +0,0 @@ -package edu.berkeley.slipway; - -import edu.berkeley.obits.*; -import org.ibex.util.Log; -import java.io.*; -import java.util.*; - -public interface Board { - - /** boot the board using an md4 configuration stream */ - public abstract void boot(Reader r) throws Exception; - - /** reset the board */ - public abstract void reset() throws IOException; - - /** the UART inputstream (after loading initial config) */ - public abstract InputStream getInputStream(); - - /** the UART inputstream (after loading initial config) */ - public abstract OutputStream getOutputStream(); - -} diff --git a/src/edu/berkeley/slipway/FakeBoard.java b/src/edu/berkeley/slipway/FakeBoard.java index 6e579b7..bf9f725 100644 --- a/src/edu/berkeley/slipway/FakeBoard.java +++ b/src/edu/berkeley/slipway/FakeBoard.java @@ -60,7 +60,7 @@ public class FakeBoard extends FpslicDevice implements Board { }; } - //public void selfTest(SelfTestResultListener resultListener) throws Exception { } + public void selfTest(SelfTestResultListener resultListener) throws Exception { } public Device getDevice() { return this; } diff --git a/src/edu/berkeley/slipway/SerialBoard.java b/src/edu/berkeley/slipway/SerialBoard.java index ff4f17d..99c2324 100644 --- a/src/edu/berkeley/slipway/SerialBoard.java +++ b/src/edu/berkeley/slipway/SerialBoard.java @@ -1,6 +1,6 @@ package edu.berkeley.slipway; -import edu.berkeley.obits.*; +import edu.berkeley.abits.*; import org.ibex.util.Log; import java.io.*; import java.util.*; -- 1.7.10.4