projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/telegps: Undo the frequency/telemetry menu changes
[fw/altos]
/
ao-tools
/
ao-load
/
ao-load.c
diff --git
a/ao-tools/ao-load/ao-load.c
b/ao-tools/ao-load/ao-load.c
index e3cef4a5664f61c8d06959482dc48db8a342a08d..0cf03772073c5a503ea5e8364547b42e143e8115 100644
(file)
--- a/
ao-tools/ao-load/ao-load.c
+++ b/
ao-tools/ao-load/ao-load.c
@@
-26,7
+26,7
@@
#define AO_USB_DESC_STRING 3
#define AO_USB_DESC_STRING 3
-struct sym {
+st
atic st
ruct sym {
unsigned addr;
char *name;
int required;
unsigned addr;
char *name;
int required;
@@
-80,7
+80,7
@@
find_symbols(FILE *map)
}
static int
}
static int
-rewrite(struct hex_image *image, unsigned addr, char *data, int len)
+rewrite(struct
ao_
hex_image *image, unsigned addr, char *data, int len)
{
int i;
if (addr < image->address || image->address + image->length < addr + len)
{
int i;
if (addr < image->address || image->address + image->length < addr + len)
@@
-114,8
+114,8
@@
main (int argc, char **argv)
struct ccdbg *dbg;
uint8_t status;
uint16_t pc;
struct ccdbg *dbg;
uint8_t status;
uint16_t pc;
- struct
hex_file
*hex;
- struct hex_image *image;
+ struct
ao_hex_file
*hex;
+ struct
ao_
hex_image *image;
char *filename;
FILE *file;
FILE *map;
char *filename;
FILE *file;
FILE *map;
@@
-182,18
+182,18
@@
main (int argc, char **argv)
}
fclose(map);
}
fclose(map);
- hex =
ccdbg
_hex_file_read(file, filename);
+ hex =
ao
_hex_file_read(file, filename);
fclose(file);
if (!hex) {
perror(filename);
exit (1);
}
fclose(file);
if (!hex) {
perror(filename);
exit (1);
}
- image =
ccdbg
_hex_image_create(hex);
+ image =
ao
_hex_image_create(hex);
if (!image) {
fprintf(stderr, "image create failed\n");
exit (1);
}
if (!image) {
fprintf(stderr, "image create failed\n");
exit (1);
}
-
ccdbg
_hex_file_free(hex);
+
ao
_hex_file_free(hex);
serial = strtoul(serial_string, NULL, 0);
if (!serial)
serial = strtoul(serial_string, NULL, 0);
if (!serial)
@@
-276,7
+276,7
@@
main (int argc, char **argv)
} else {
printf("Cannot load code to 0x%04x\n",
image->address);
} else {
printf("Cannot load code to 0x%04x\n",
image->address);
-
ccdbg
_hex_image_free(image);
+
ao
_hex_image_free(image);
ccdbg_close(dbg);
exit(1);
}
ccdbg_close(dbg);
exit(1);
}