projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Support TeleMega v5.0
[fw/altos]
/
altoslib
/
AltosDebug.java
diff --git
a/altoslib/AltosDebug.java
b/altoslib/AltosDebug.java
index 4dfb31e5ebf5860e85d9dbe542dcb91535c494f1..117b04504ee4968de26ce14480a44fcd228a0182 100644
(file)
--- 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
*
* 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
*
* 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.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
3
;
+package org.altusmetrum.altoslib_
14
;
import java.io.*;
import java.io.*;
@@
-52,7
+53,7
@@
public class AltosDebug {
public static final byte GET_CHIP_ID = 0x68;
public static final byte GET_CHIP_ID = 0x68;
- AltosLink link;
+
private
AltosLink link;
boolean debug_mode;
boolean debug_mode;
@@
-112,7
+113,11
@@
public class AltosDebug {
int i = 0;
int start = 0;
while (i < length) {
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
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 {
public AltosRomconfig romconfig() throws InterruptedException {
try {
- byte[] bytes = read_memory(0x
a0, 1
0);
- AltosHexfile hexfile = new AltosHexfile (bytes, 0x
a
0);
+ byte[] bytes = read_memory(0x
00, 0x20
0);
+ AltosHexfile hexfile = new AltosHexfile (bytes, 0x
0
0);
return new AltosRomconfig(hexfile);
} catch (IOException ie) {
}
return new AltosRomconfig(hexfile);
} catch (IOException ie) {
}
@@
-277,4
+282,4
@@
public class AltosDebug {
public AltosDebug (AltosLink link) {
this.link = link;
}
public AltosDebug (AltosLink link) {
this.link = link;
}
-}
\ No newline at end of file
+}