projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Pass InterruptedException up the stack instead of hiding it
[fw/altos]
/
altoslib
/
AltosSelfFlash.java
diff --git
a/altoslib/AltosSelfFlash.java
b/altoslib/AltosSelfFlash.java
index 07952d7f76fc97ba61519a4a55ef79ce6a91183a..327a90bd645beef4f110228c026c8a9c6a62d58d 100644
(file)
--- a/
altoslib/AltosSelfFlash.java
+++ b/
altoslib/AltosSelfFlash.java
@@
-130,7
+130,10
@@
public class AltosSelfFlash extends AltosProgrammer {
public void close() {
if (link != null) {
reboot();
public void close() {
if (link != null) {
reboot();
- link.close();
+ try {
+ link.close();
+ } catch (InterruptedException ie) {
+ }
link = null;
}
}
link = null;
}
}
@@
-140,7
+143,7
@@
public class AltosSelfFlash extends AltosProgrammer {
close();
}
close();
}
- private AltosHexfile get_rom() {
+ private AltosHexfile get_rom()
throws InterruptedException
{
System.out.printf("get rom\n");
try {
int base = AltosRomconfig.fetch_base(image);
System.out.printf("get rom\n");
try {
int base = AltosRomconfig.fetch_base(image);
@@
-152,15
+155,13
@@
public class AltosSelfFlash extends AltosProgrammer {
} catch (AltosNoSymbol none) {
System.out.printf("no symbol %s\n", none.getMessage());
return null;
} catch (AltosNoSymbol none) {
System.out.printf("no symbol %s\n", none.getMessage());
return null;
- } catch (InterruptedException ie) {
- return null;
} catch (IOException ie) {
return null;
}
}
} catch (IOException ie) {
return null;
}
}
- public boolean check_rom_config() {
+ public boolean check_rom_config()
throws InterruptedException
{
if (link == null) {
System.out.printf ("no link\n");
return true;
if (link == null) {
System.out.printf ("no link\n");
return true;
@@
-177,7
+178,7
@@
public class AltosSelfFlash extends AltosProgrammer {
rom_config = romconfig;
}
rom_config = romconfig;
}
- public AltosRomconfig romconfig() {
+ public AltosRomconfig romconfig()
throws InterruptedException
{
System.out.printf("fetch romconfig\n");
if (!check_rom_config())
return null;
System.out.printf("fetch romconfig\n");
if (!check_rom_config())
return null;