X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroUSB.java;h=092c3d44ef34d8c6bad9bc7f31726053f7072da0;hp=ae582a31b4750ecedda294005857159c66de241c;hb=56629222711ba3ef7853405c9b07ad614fb29b95;hpb=a3f26f6d0c7574b8cdaecbccd7cfe89aaeb736b0

diff --git a/micropeak/MicroUSB.java b/micropeak/MicroUSB.java
index ae582a31..092c3d44 100644
--- 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_5.*;
-import org.altusmetrum.altosuilib_3.*;
+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;