altoslib: Remove spurious semicolon in AltosReplayReader.java

[fw/altos] / altoslib / AltosSelfFlash.java

diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java
index 07952d7f76fc97ba61519a4a55ef79ce6a91183a..537821729fc9a03adb4885d4d38337f2cede870b 100644 (file)
--- a/altoslib/AltosSelfFlash.java
+++ b/altoslib/AltosSelfFlash.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,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_12;
 
 import java.io.*;
 
@@ -47,7 +48,7 @@ public class AltosSelfFlash extends AltosProgrammer {
                for (int offset = 0; offset < len; offset += 0x100) {
                        link.printf("R %x\n", addr + offset);
                        byte[]  reply = link.get_binary_reply(5000, 0x100);
-                       
+
                        if (reply == null)
                                throw new IOException("Read device memory timeout");
                        for (b = 0; b < len; b++)
@@ -55,10 +56,9 @@ public class AltosSelfFlash extends AltosProgrammer {
                }
                return data;
        }
-               
+
        void write_memory(long addr, byte[] data, int start, int len) {
                int b;
-               System.out.printf ("write_memory %x %d\n", addr, len);
                link.printf("W %x\n", addr);
                link.flush_output();
                for (b = 0; b < len; b++)
@@ -68,7 +68,6 @@ public class AltosSelfFlash extends AltosProgrammer {
        }
 
        void reboot() {
-               System.out.printf("reboot\n");
                link.printf("a\n");
                link.flush_output();
        }
@@ -115,7 +114,6 @@ public class AltosSelfFlash extends AltosProgrammer {
                                action(image.data.length - remain, image.data.length);
                        }
                        if (!aborted) {
-                               System.out.printf ("done\n");
                                action("done", 100);
                        }
                        close();
@@ -130,7 +128,10 @@ public class AltosSelfFlash extends AltosProgrammer {
        public void close() {
                if (link != null) {
                        reboot();
-                       link.close();
+                       try {
+                               link.close();
+                       } catch (InterruptedException ie) {
+                       }
                        link = null;
                }
        }
@@ -140,8 +141,7 @@ public class AltosSelfFlash extends AltosProgrammer {
                close();
        }
 
-       private AltosHexfile get_rom() {
-               System.out.printf("get rom\n");
+       private AltosHexfile get_rom() throws InterruptedException {
                try {
                        int base = AltosRomconfig.fetch_base(image);
                        int bounds = AltosRomconfig.fetch_bounds(image);
@@ -150,9 +150,6 @@ public class AltosSelfFlash extends AltosProgrammer {
                        hexfile.add_symbols(image);
                        return hexfile;
                } catch (AltosNoSymbol none) {
-                       System.out.printf("no symbol %s\n", none.getMessage());
-                       return null;
-               } catch (InterruptedException ie) {
                        return null;
                } catch (IOException ie) {
                        return null;
@@ -160,9 +157,8 @@ public class AltosSelfFlash extends AltosProgrammer {
 
        }
 
-       public boolean check_rom_config() {
+       public boolean check_rom_config() throws InterruptedException {
                if (link == null) {
-                       System.out.printf ("no link\n");
                        return true;
                }
                if (rom_config == null) {
@@ -177,8 +173,7 @@ public class AltosSelfFlash extends AltosProgrammer {
                rom_config = romconfig;
        }
 
-       public AltosRomconfig romconfig() {
-               System.out.printf("fetch romconfig\n");
+       public AltosRomconfig romconfig() throws InterruptedException {
                if (!check_rom_config())
                        return null;
                return rom_config;
@@ -191,6 +186,5 @@ public class AltosSelfFlash extends AltosProgrammer {
                this.listener = listener;
                input = new FileInputStream(file);
                image = new AltosHexfile(input);
-               System.out.printf ("AltosSelfFlash %x\n", image.address);
        }
 }
\ No newline at end of file