From: adam <adam@megacz.com>
Date: Wed, 20 Sep 2006 08:33:41 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~77
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=37015141a62a639e7d5f67729866277f76387916;hp=1569edbaee7c8ff330a7f3289856970c46082a12;p=slipway.git

checkpoint
---

diff --git a/src/com/atmel/fpslic/Chip.java b/src/com/atmel/fpslic/Chip.java
new file mode 100644
index 0000000..23f1be3
--- /dev/null
+++ b/src/com/atmel/fpslic/Chip.java
@@ -0,0 +1,22 @@
+package com.atmel.fpslic;
+
+import com.ftdi.usb.*;
+import java.io.*;
+
+public interface Chip {
+    
+    public void    doReset();
+    public void    reset(boolean on);
+    public void    avrrst(boolean on);
+    public void    config(boolean bit);
+    public void    config(int data, int numbits);
+    public boolean initErr();
+
+    public void    con(boolean b);
+    public boolean con();
+    public boolean rcon();
+
+    //remove
+    public void flush();
+    public int readPins();
+}
diff --git a/src/edu/berkeley/obits/device/atmel/ChipImpl.java b/src/com/atmel/fpslic/ChipImpl.java
similarity index 92%
rename from src/edu/berkeley/obits/device/atmel/ChipImpl.java
rename to src/com/atmel/fpslic/ChipImpl.java
index 05ed4f2..7f0fccd 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/com/atmel/fpslic/ChipImpl.java
@@ -1,4 +1,4 @@
-package edu.berkeley.obits.device.atmel;
+package com.atmel.fpslic;
 import com.ftdi.usb.*;
 import java.io.*;
 
@@ -58,15 +58,6 @@ public class ChipImpl extends FtdiUart implements Chip {
         con(false);
     }
 
-    int porte = 0;
-    public void porte(int pin, boolean b) {
-        porte = (~(1<<pin)) | (b ? (1<<pin) : 0);
-        if (pin==4) {
-            dbang(2, b);
-            flush();
-        }
-    }
-
     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/AtmelSerial.java b/src/edu/berkeley/obits/AtmelSerial.java
index 24e2976..d8deb7d 100644
--- a/src/edu/berkeley/obits/AtmelSerial.java
+++ b/src/edu/berkeley/obits/AtmelSerial.java
@@ -1,5 +1,6 @@
 package edu.berkeley.obits;
 
+import edu.berkeley.slipway.*;
 import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
 import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
 import edu.berkeley.obits.device.atmel.*;
diff --git a/src/edu/berkeley/obits/device/atmel/AvrDrone.java b/src/edu/berkeley/obits/device/atmel/AvrDrone.java
index 23cf27d..06849cd 100644
--- a/src/edu/berkeley/obits/device/atmel/AvrDrone.java
+++ b/src/edu/berkeley/obits/device/atmel/AvrDrone.java
@@ -1,5 +1,6 @@
 package edu.berkeley.obits.device.atmel;
 
+import edu.berkeley.slipway.*;
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;
 import java.io.*;
diff --git a/src/edu/berkeley/obits/device/atmel/Chip.java b/src/edu/berkeley/obits/device/atmel/Chip.java
deleted file mode 100644
index f239807..0000000
--- a/src/edu/berkeley/obits/device/atmel/Chip.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package edu.berkeley.obits.device.atmel;
-import com.ftdi.usb.*;
-import java.io.*;
-
-public interface Chip {
-    
-    public void doReset();
-    public void reset(boolean on);
-    public void avrrst(boolean on);
-    public void config(boolean bit);
-    public void config(int data, int numbits);
-    public boolean initErr();
-    public void    porte(int pin, boolean b);
-    public void    con(boolean b);
-    public boolean con();
-    public boolean rcon();
-
-    //remove
-    public void flush();
-    public int readPins();
-}
diff --git a/src/edu/berkeley/obits/device/atmel/Board.java b/src/edu/berkeley/slipway/Board.java
similarity index 89%
rename from src/edu/berkeley/obits/device/atmel/Board.java
rename to src/edu/berkeley/slipway/Board.java
index e4eb60b..ed0352f 100644
--- a/src/edu/berkeley/obits/device/atmel/Board.java
+++ b/src/edu/berkeley/slipway/Board.java
@@ -1,4 +1,4 @@
-package edu.berkeley.obits.device.atmel;
+package edu.berkeley.slipway;
 
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;
diff --git a/src/edu/berkeley/obits/device/atmel/FakeBoard.java b/src/edu/berkeley/slipway/FakeBoard.java
similarity index 90%
rename from src/edu/berkeley/obits/device/atmel/FakeBoard.java
rename to src/edu/berkeley/slipway/FakeBoard.java
index e29c5fb..d2d3594 100644
--- a/src/edu/berkeley/obits/device/atmel/FakeBoard.java
+++ b/src/edu/berkeley/slipway/FakeBoard.java
@@ -1,4 +1,4 @@
-package edu.berkeley.obits.device.atmel;
+package edu.berkeley.slipway;
 
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java b/src/edu/berkeley/slipway/FtdiBoard.java
similarity index 98%
rename from src/edu/berkeley/obits/device/atmel/FtdiBoard.java
rename to src/edu/berkeley/slipway/FtdiBoard.java
index 05616af..962ddce 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
+++ b/src/edu/berkeley/slipway/FtdiBoard.java
@@ -1,5 +1,6 @@
-package edu.berkeley.obits.device.atmel;
+package edu.berkeley.slipway;
 
+import com.atmel.fpslic.*;
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;
 import java.io.*;
diff --git a/src/edu/berkeley/obits/device/atmel/SerialBoard.java b/src/edu/berkeley/slipway/SerialBoard.java
similarity index 97%
rename from src/edu/berkeley/obits/device/atmel/SerialBoard.java
rename to src/edu/berkeley/slipway/SerialBoard.java
index 608dcac..0c88da4 100644
--- a/src/edu/berkeley/obits/device/atmel/SerialBoard.java
+++ b/src/edu/berkeley/slipway/SerialBoard.java
@@ -1,4 +1,4 @@
-package edu.berkeley.obits.device.atmel;
+package edu.berkeley.slipway;
 
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;