X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroSerial.java;h=15ef858244bcfa5cc3efee138d56caf008115bdc;hp=a1a77a1d5b3b5516f877108f4eea886737a9733d;hb=d83587c3c66b730cc54ca153714eee520ee40b2c;hpb=65b512c890a3ccf487655b79305ab1cfcf49259c

diff --git a/micropeak/MicroSerial.java b/micropeak/MicroSerial.java
index a1a77a1d..15ef8582 100644
--- a/micropeak/MicroSerial.java
+++ b/micropeak/MicroSerial.java
@@ -27,6 +27,10 @@ public class MicroSerial extends InputStream {
 
 	public int read() {
 		int	c = libaltos.altos_getchar(file, 0);
+		if (Thread.interrupted())
+			return -1;
+		if (c == -1)
+			return -1;
 		if (AltosUIPreferences.serial_debug)
 			System.out.printf("%c", c);
 		return c;
@@ -39,12 +43,12 @@ public class MicroSerial extends InputStream {
 		}
 	}
 
-	public MicroSerial(MicroUSB usb) throws FileNotFoundException {
-		file = usb.open();
+	public MicroSerial(AltosDevice device) throws FileNotFoundException {
+		file = device.open();
 		if (file == null) {
-			final String message = usb.getErrorString();
+			final String message = device.getErrorString();
 			throw new FileNotFoundException(String.format("%s (%s)",
-								      usb.toShortString(),
+								      device.toShortString(),
 								      message));
 		}
 	}