altoslib/altosuilib: Update library version to 7

[fw/altos] / altoslib / AltosSelfFlash.java

diff --git a/altoslib/AltosSelfFlash.java b/altoslib/AltosSelfFlash.java
index 327a90bd645beef4f110228c026c8a9c6a62d58d..1be45998f3d17c3a9483b79d3a9e9e22693aaa12 100644 (file)
--- a/altoslib/AltosSelfFlash.java
+++ b/altoslib/AltosSelfFlash.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_7;
 
 import java.io.*;
 
@@ -47,7 +47,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 +55,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 +67,6 @@ public class AltosSelfFlash extends AltosProgrammer {
        }
 
        void reboot() {
-               System.out.printf("reboot\n");
                link.printf("a\n");
                link.flush_output();
        }
@@ -115,7 +113,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();
@@ -144,7 +141,6 @@ public class AltosSelfFlash extends AltosProgrammer {
        }
 
        private AltosHexfile get_rom() throws InterruptedException {
-               System.out.printf("get rom\n");
                try {
                        int base = AltosRomconfig.fetch_base(image);
                        int bounds = AltosRomconfig.fetch_bounds(image);
@@ -153,7 +149,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 (IOException ie) {
                        return null;
@@ -163,7 +158,6 @@ public class AltosSelfFlash extends AltosProgrammer {
 
        public boolean check_rom_config() throws InterruptedException {
                if (link == null) {
-                       System.out.printf ("no link\n");
                        return true;
                }
                if (rom_config == null) {
@@ -179,7 +173,6 @@ public class AltosSelfFlash extends AltosProgrammer {
        }
 
        public AltosRomconfig romconfig() throws InterruptedException {
-               System.out.printf("fetch romconfig\n");
                if (!check_rom_config())
                        return null;
                return rom_config;
@@ -192,6 +185,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