From: adam <adam@megacz.com>
Date: Fri, 22 Sep 2006 07:13:35 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~37
X-Git-Url: http://git.megacz.com/?p=slipway.git;a=commitdiff_plain;h=e87e5b9df3f42b4d8f9d42359532da6cd34a4d95

checkpoint
---

diff --git a/src/edu/berkeley/obits/device/atmel/AtmelDevice.java b/src/com/atmel/fpslic/Fpslic.java
similarity index 96%
rename from src/edu/berkeley/obits/device/atmel/AtmelDevice.java
rename to src/com/atmel/fpslic/Fpslic.java
index a25a707..8ad7175 100644
--- a/src/edu/berkeley/obits/device/atmel/AtmelDevice.java
+++ b/src/com/atmel/fpslic/Fpslic.java
@@ -1,12 +1,10 @@
-package edu.berkeley.obits.device.atmel;
+package com.atmel.fpslic;
 
-import edu.berkeley.obits.*;
-//import static edu.berkeley.cs.obits.device.atmel.Wires.*;
 import java.util.*;
 import java.io.*;
 import org.ibex.util.Log;
 
-public abstract class AtmelDevice {
+public abstract class Fpslic {
 
     public static class Util {
         public static int lutSwap(int x) {
diff --git a/src/edu/berkeley/obits/AtmelSerial.java b/src/edu/berkeley/obits/AtmelSerial.java
index 54cee70..dd37793 100644
--- a/src/edu/berkeley/obits/AtmelSerial.java
+++ b/src/edu/berkeley/obits/AtmelSerial.java
@@ -1,8 +1,8 @@
 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 static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.device.atmel.*;
 import edu.berkeley.obits.gui.*;
 import java.awt.*;
diff --git a/src/edu/berkeley/obits/device/atmel/At40k.java b/src/edu/berkeley/obits/device/atmel/At40k.java
index 58116a0..350f3fb 100644
--- a/src/edu/berkeley/obits/device/atmel/At40k.java
+++ b/src/edu/berkeley/obits/device/atmel/At40k.java
@@ -1,5 +1,8 @@
 package edu.berkeley.obits.device.atmel;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
+
+import com.atmel.fpslic.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import org.ibex.util.*;
 import java.util.*;
@@ -7,18 +10,18 @@ import java.io.*;
 
 public class At40k {
 
-    /*private*/public final AtmelDevice dev;
+    /*private*/public final Fpslic dev;
     private final int width;
     private final int height;
 
-    public At40k(AtmelDevice dev, int width, int height) {
+    public At40k(Fpslic dev, int width, int height) {
         this.width = width;
         this.height = height;
         this.dev = dev;
     }
 
     public static class At40k10 extends At40k {
-        public At40k10(AtmelDevice dev) { super(dev, 24, 24); }
+        public At40k10(Fpslic dev) { super(dev, 24, 24); }
     }
 
     public final class Sector {
diff --git a/src/edu/berkeley/obits/device/atmel/AvrDrone.java b/src/edu/berkeley/obits/device/atmel/AvrDrone.java
index 6c3503b..2854ece 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 com.atmel.fpslic.*;
 import edu.berkeley.slipway.*;
 import edu.berkeley.obits.*;
 import org.ibex.util.Log;
@@ -8,7 +9,7 @@ import java.util.*;
 import gnu.io.*;
 
 /** the "host" side of the AVR Drone; see AvrDrone.c for the other side */
-public class AvrDrone extends AtmelDevice {
+public class AvrDrone extends Fpslic {
 
     private final DataInputStream in;
     private final DataOutputStream out;
diff --git a/src/edu/berkeley/obits/device/atmel/FakeAtmelDevice.java b/src/edu/berkeley/obits/device/atmel/FakeAtmelDevice.java
index f603009..c5947d3 100644
--- a/src/edu/berkeley/obits/device/atmel/FakeAtmelDevice.java
+++ b/src/edu/berkeley/obits/device/atmel/FakeAtmelDevice.java
@@ -1,11 +1,12 @@
 package edu.berkeley.obits.device.atmel;
 
+import com.atmel.fpslic.*;
 import edu.berkeley.obits.*;
 import java.util.*;
 import java.io.*;
 import org.ibex.util.Log;
 
-public class FakeAtmelDevice extends AtmelDevice {
+public class FakeAtmelDevice extends Fpslic {
 
     public void mode4(int z, int y, int x, int d) { }
     public byte mode4(int z, int y, int x) {
diff --git a/src/edu/berkeley/obits/gui/G.java b/src/edu/berkeley/obits/gui/G.java
index feecf13..d5103d8 100644
--- a/src/edu/berkeley/obits/gui/G.java
+++ b/src/edu/berkeley/obits/gui/G.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.gui;
 
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;
 import java.awt.*;
diff --git a/src/edu/berkeley/obits/gui/Gui.java b/src/edu/berkeley/obits/gui/Gui.java
index 59e4cc8..f5d5f71 100644
--- a/src/edu/berkeley/obits/gui/Gui.java
+++ b/src/edu/berkeley/obits/gui/Gui.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.gui;
 
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;
 import java.awt.*;
diff --git a/src/edu/berkeley/obits/gui/GuiConstants.java b/src/edu/berkeley/obits/gui/GuiConstants.java
index 5e2606a..2fcdfae 100644
--- a/src/edu/berkeley/obits/gui/GuiConstants.java
+++ b/src/edu/berkeley/obits/gui/GuiConstants.java
@@ -1,7 +1,8 @@
 package edu.berkeley.obits.gui;
 
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
+import com.atmel.fpslic.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;
 import java.awt.*;
diff --git a/src/edu/berkeley/obits/gui/P.java b/src/edu/berkeley/obits/gui/P.java
index 5a5b96f..e0b8e4c 100644
--- a/src/edu/berkeley/obits/gui/P.java
+++ b/src/edu/berkeley/obits/gui/P.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.gui;
 
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;
 import java.awt.*;
diff --git a/src/edu/berkeley/obits/gui/ZoomingPanel.java b/src/edu/berkeley/obits/gui/ZoomingPanel.java
index 39d3326..23c6b47 100644
--- a/src/edu/berkeley/obits/gui/ZoomingPanel.java
+++ b/src/edu/berkeley/obits/gui/ZoomingPanel.java
@@ -1,7 +1,7 @@
 package edu.berkeley.obits.gui;
 
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Constants.*;
-import static edu.berkeley.obits.device.atmel.AtmelDevice.Util.*;
+import static com.atmel.fpslic.Fpslic.Constants.*;
+import static com.atmel.fpslic.Fpslic.Util.*;
 import edu.berkeley.obits.*;
 import edu.berkeley.obits.device.atmel.*;
 import java.awt.*;