projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ccdbg and altos sources into one giant repository
[fw/altos]
/
aoload
/
aoload.c
diff --git
a/aoload/aoload.c
b/aoload/aoload.c
index a36ad375e6c8a8fd006b25ecd78f1352a3f5c666..b84a88a68f25c9b07530d6bb5e7d5b99385174ef 100644
(file)
--- a/
aoload/aoload.c
+++ b/
aoload/aoload.c
@@
-128,7
+128,7
@@
main (int argc, char **argv)
serial_string = argv[2];
if (serial_string == NULL)
usage(argv[0]);
serial_string = argv[2];
if (serial_string == NULL)
usage(argv[0]);
-
+
file = fopen(filename, "r");
if (!file) {
perror(filename);
file = fopen(filename, "r");
if (!file) {
perror(filename);
@@
-170,7
+170,7
@@
main (int argc, char **argv)
AO_SERIAL_NUMBER);
exit(1);
}
AO_SERIAL_NUMBER);
exit(1);
}
-
+
usb_descriptors = AO_USB_DESCRIPTORS - image->address;
string_num = 0;
while (image->data[usb_descriptors] != 0 && usb_descriptors < image->length) {
usb_descriptors = AO_USB_DESCRIPTORS - image->address;
string_num = 0;
while (image->data[usb_descriptors] != 0 && usb_descriptors < image->length) {
@@
-185,7
+185,7
@@
main (int argc, char **argv)
fprintf(stderr, "Cannot rewrite serial string at %04x\n", AO_USB_DESCRIPTORS);
exit(1);
}
fprintf(stderr, "Cannot rewrite serial string at %04x\n", AO_USB_DESCRIPTORS);
exit(1);
}
-
+
serial_ucs2_len = image->data[usb_descriptors] - 2;
serial_ucs2 = malloc(serial_ucs2_len);
if (!serial_ucs2) {
serial_ucs2_len = image->data[usb_descriptors] - 2;
serial_ucs2 = malloc(serial_ucs2_len);
if (!serial_ucs2) {
@@
-200,11
+200,11
@@
main (int argc, char **argv)
}
if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
usage(argv[0]);
}
if (!rewrite(image, usb_descriptors + 2 + image->address, serial_ucs2, serial_ucs2_len))
usage(argv[0]);
-
+
dbg = ccdbg_open();
if (!dbg)
exit (1);
dbg = ccdbg_open();
if (!dbg)
exit (1);
-
+
ccdbg_add_debug(CC_DEBUG_FLASH);
ccdbg_debug_mode(dbg);
ccdbg_add_debug(CC_DEBUG_FLASH);
ccdbg_debug_mode(dbg);