X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosDebug.java;h=57e97a18fe36cd50e92479b47ab05583d30625b2;hp=fb11d39abac0b49e01abf532eabaca4429cb1b89;hb=6023ff81f1bbd240169b9548209133d3b02d475f;hpb=e26306c9350ef1d107d4257ef1c09d15165c9154

diff --git a/altoslib/AltosDebug.java b/altoslib/AltosDebug.java
index fb11d39a..57e97a18 100644
--- a/altoslib/AltosDebug.java
+++ b/altoslib/AltosDebug.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_13;
 
 import java.io.*;
 
@@ -52,7 +53,7 @@ public class AltosDebug {
 	public static final byte GET_CHIP_ID =		0x68;
 
 
-	AltosLink	link;
+	private AltosLink	link;
 
 	boolean	debug_mode;
 
@@ -112,7 +113,11 @@ public class AltosDebug {
 		int i = 0;
 		int start = 0;
 		while (i < length) {
-			String	line = link.get_reply().trim();
+			String	line = link.get_reply();
+			if (line == null)
+				throw new IOException("No reply");
+
+			line = line.trim();
 			if (!AltosLib.ishex(line) || line.length() % 2 != 0)
 				throw new IOException(
 					String.format
@@ -259,8 +264,8 @@ public class AltosDebug {
 
 	public AltosRomconfig romconfig() throws InterruptedException {
 		try {
-			byte[] bytes = read_memory(0xa0, 10);
-			AltosHexfile hexfile = new AltosHexfile (bytes, 0xa0);
+			byte[] bytes = read_memory(0x00, 0x200);
+			AltosHexfile hexfile = new AltosHexfile (bytes, 0x00);
 			return new AltosRomconfig(hexfile);
 		} catch (IOException ie) {
 		}
@@ -277,4 +282,4 @@ public class AltosDebug {
 	public AltosDebug (AltosLink link) {
 		this.link = link;
 	}
-}
\ No newline at end of file
+}