X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosFlash.java;h=c8db1f778ab32ff2421f68d7fbac0de9cf208705;hp=d806915797b7362512e5bd0d6643def2b9b0f342;hb=10834eb60f7a44fee159d9e9ad5ffb2e013fe9cf;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosFlash.java b/altoslib/AltosFlash.java
index d8069157..c8db1f77 100644
--- a/altoslib/AltosFlash.java
+++ b/altoslib/AltosFlash.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
@@ -15,11 +16,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 
-public class AltosFlash {
+public class AltosFlash extends AltosProgrammer {
 	File			file;
 	FileInputStream		input;
 	AltosHexfile		image;
@@ -318,7 +319,7 @@ public class AltosFlash {
 		close();
 	}
 
-	public boolean check_rom_config() {
+	public boolean check_rom_config() throws InterruptedException {
 		if (debug == null)
 			return true;
 		if (rom_config == null)
@@ -330,7 +331,7 @@ public class AltosFlash {
 		rom_config = romconfig;
 	}
 
-	public AltosRomconfig romconfig() {
+	public AltosRomconfig romconfig() throws InterruptedException {
 		if (!check_rom_config())
 			return null;
 		return rom_config;
@@ -345,9 +346,23 @@ public class AltosFlash {
 			debug = new AltosDebug(link);
 		input = new FileInputStream(file);
 		image = new AltosHexfile(input);
-		if (debug != null && !debug.check_connection()) {
+
+		boolean connection_ok = true;
+
+		if (debug != null) {
+			try {
+				connection_ok = debug.check_connection();
+			} catch (IOException ie) {
+				debug.close();
+				throw ie;
+			} catch (InterruptedException ie) {
+				debug.close();
+				throw ie;
+			}
+		}
+		if (!connection_ok) {
 			debug.close();
 			throw new IOException("Debug port not connected");
 		}
 	}
-}
\ No newline at end of file
+}