projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib: Deal with new Mega log format that has 32-bit gyro cal
[fw/altos]
/
ao-tools
/
ao-dbg
/
ao-dbg-command.c
diff --git
a/ao-tools/ao-dbg/ao-dbg-command.c
b/ao-tools/ao-dbg/ao-dbg-command.c
index eab7bc689d7502f5832f61957ac06e22e8556fb2..11c521e88d5a47614137a651f4ac6a02a7a252fa 100644
(file)
--- a/
ao-tools/ao-dbg/ao-dbg-command.c
+++ b/
ao-tools/ao-dbg/ao-dbg-command.c
@@
-202,8
+202,8
@@
command_dump (int argc, char **argv)
enum command_result
command_file (int argc, char **argv)
{
enum command_result
command_file (int argc, char **argv)
{
- struct hex_file *hex;
- struct hex_image *image;
+ struct
ao_
hex_file *hex;
+ struct
ao_
hex_image *image;
FILE *file;
if (argc != 2)
FILE *file;
if (argc != 2)
@@
-211,16
+211,16
@@
command_file (int argc, char **argv)
file = fopen (argv[1], "r");
if (!file)
return command_error;
file = fopen (argv[1], "r");
if (!file)
return command_error;
- hex =
ccdbg
_hex_file_read(file, argv[1]);
+ hex =
ao
_hex_file_read(file, argv[1]);
fclose(file);
if (!hex)
return command_error;
if (hex->nrecord == 0) {
fclose(file);
if (!hex)
return command_error;
if (hex->nrecord == 0) {
-
ccdbg
_hex_file_free(hex);
+
ao
_hex_file_free(hex);
return command_error;
}
return command_error;
}
- image =
ccdbg
_hex_image_create(hex);
-
ccdbg
_hex_file_free(hex);
+ image =
ao
_hex_image_create(hex);
+
ao
_hex_file_free(hex);
start_address = image->address;
ccdbg_set_rom(s51_dbg, image);
return command_success;
start_address = image->address;
ccdbg_set_rom(s51_dbg, image);
return command_success;
@@
-495,8
+495,8
@@
command_load (int argc, char **argv)
{
char *filename = argv[1];
FILE *file;
{
char *filename = argv[1];
FILE *file;
- struct
hex_file
*hex;
- struct hex_image *image;
+ struct
ao_hex_file
*hex;
+ struct
ao_
hex_image *image;
if (!filename)
return command_error;
if (!filename)
return command_error;
@@
-505,13
+505,13
@@
command_load (int argc, char **argv)
perror(filename);
return command_error;
}
perror(filename);
return command_error;
}
- hex =
ccdbg
_hex_file_read(file, filename);
+ hex =
ao
_hex_file_read(file, filename);
fclose(file);
if (!hex) {
return command_error;
}
fclose(file);
if (!hex) {
return command_error;
}
- image =
ccdbg
_hex_image_create(hex);
-
ccdbg
_hex_file_free(hex);
+ image =
ao
_hex_image_create(hex);
+
ao
_hex_file_free(hex);
if (!image) {
fprintf(stderr, "image create failed\n");
return command_error;
if (!image) {
fprintf(stderr, "image create failed\n");
return command_error;
@@
-523,7
+523,7
@@
command_load (int argc, char **argv)
} else {
fprintf(stderr, "Can only load to RAM\n");
}
} else {
fprintf(stderr, "Can only load to RAM\n");
}
-
ccdbg
_hex_image_free(image);
+
ao
_hex_image_free(image);
return command_success;
}
return command_success;
}