altos: Remove cc1111 products

[fw/altos] / micropeak / MicroUSB.java

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index f6568d3663b50308c32aefd292d4deb10806fbcd..092c3d44ef34d8c6bad9bc7f31726053f7072da0 100644 (file)
--- a/micropeak/MicroUSB.java
+++ b/micropeak/MicroUSB.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,8 +20,8 @@ package org.altusmetrum.micropeak;
 
 import java.util.*;
 import libaltosJNI.*;
-import org.altusmetrum.altoslib_9.*;
-import org.altusmetrum.altosuilib_9.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 public class MicroUSB extends altos_device implements AltosDevice {
 
@@ -96,6 +97,25 @@ public class MicroUSB extends altos_device implements AltosDevice {
                return isFTDI() || isMicro();
        }
 
+       public int hashCode() {
+               return getVendor() ^ getProduct() ^ getSerial() ^ getPath().hashCode();
+       }
+
+       public boolean equals(Object o) {
+               if (o == null)
+                       return false;
+
+               if (!(o instanceof MicroUSB))
+                       return false;
+
+               MicroUSB other = (MicroUSB) o;
+
+               return getVendor() == other.getVendor() &&
+                       getProduct() == other.getProduct() &&
+                       getSerial() == other.getSerial() &&
+                       getPath().equals(other.getPath());
+       }
+
        static java.util.List<MicroUSB> list() {
                if (!load_library())
                        return null;