projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ao-tools: Allow building without stlink and readline
[fw/altos]
/
altosui
/
AltosSerial.java
diff --git
a/altosui/AltosSerial.java
b/altosui/AltosSerial.java
index 697ad539877f78bf19da5ff657c5805713e86024..491b6e81f3c9f64649537af1ee6cd53949310cfb 100644
(file)
--- a/
altosui/AltosSerial.java
+++ b/
altosui/AltosSerial.java
@@
-57,11
+57,8
@@
public class AltosSerial extends AltosLink {
public void flush_output() {
super.flush_output();
if (altos != null) {
public void flush_output() {
super.flush_output();
if (altos != null) {
- if (libaltos.altos_flush(altos) != 0) {
- libaltos.altos_close(altos);
- altos = null;
- abort_reply();
- }
+ if (libaltos.altos_flush(altos) != 0)
+ close_serial();
}
}
}
}
@@
-122,6
+119,17
@@
public class AltosSerial extends AltosLink {
SwingUtilities.invokeLater(r);
}
SwingUtilities.invokeLater(r);
}
+ private void close_serial() {
+ synchronized (devices_opened) {
+ devices_opened.remove(device.getPath());
+ }
+ if (altos != null) {
+ libaltos.altos_free(altos);
+ altos = null;
+ }
+ abort_reply();
+ }
+
public void close() {
if (remote) {
try {
public void close() {
if (remote) {
try {
@@
-132,9
+140,8
@@
public class AltosSerial extends AltosLink {
if (in_reply != 0)
System.out.printf("Uh-oh. Closing active serial device\n");
if (in_reply != 0)
System.out.printf("Uh-oh. Closing active serial device\n");
- if (altos != null) {
- libaltos.altos_close(altos);
- }
+ close_serial();
+
if (input_thread != null) {
try {
input_thread.interrupt();
if (input_thread != null) {
try {
input_thread.interrupt();
@@
-143,13
+150,6
@@
public class AltosSerial extends AltosLink {
}
input_thread = null;
}
}
input_thread = null;
}
- if (altos != null) {
- libaltos.altos_free(altos);
- altos = null;
- }
- synchronized (devices_opened) {
- devices_opened.remove(device.getPath());
- }
if (debug)
System.out.printf("Closing %s\n", device.getPath());
}
if (debug)
System.out.printf("Closing %s\n", device.getPath());
}
@@
-157,9
+157,7
@@
public class AltosSerial extends AltosLink {
private void putc(char c) {
if (altos != null)
if (libaltos.altos_putchar(altos, c) != 0) {
private void putc(char c) {
if (altos != null)
if (libaltos.altos_putchar(altos, c) != 0) {
- libaltos.altos_close(altos);
- altos = null;
- abort_reply();
+ close_serial();
}
}
}
}