projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/stm: Add casts to reduce -Wconversion warnings
[fw/altos]
/
altoslib
/
AltosFlash.java
diff --git
a/altoslib/AltosFlash.java
b/altoslib/AltosFlash.java
index e6b0571342212f93d763a746ab1d17753b672640..30ae65a7a77316bcd0a446c9b3b4d39096565e82 100644
(file)
--- a/
altoslib/AltosFlash.java
+++ b/
altoslib/AltosFlash.java
@@
-16,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_1
3
;
+package org.altusmetrum.altoslib_1
4
;
import java.io.*;
import java.io.*;
@@
-331,9
+331,13
@@
public class AltosFlash extends AltosProgrammer {
rom_config = romconfig;
}
rom_config = romconfig;
}
- public AltosRomconfig target_romconfig() throws InterruptedException {
+ public AltosRomconfig target_romconfig(
AltosUsbId usb_id, String usb_product
) throws InterruptedException {
if (!check_rom_config())
return null;
if (!check_rom_config())
return null;
+ if (rom_config.usb_id == null)
+ rom_config.usb_id = usb_id;
+ if (rom_config.usb_product == null)
+ rom_config.usb_product = usb_product;
return rom_config;
}
return rom_config;
}