projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
process updates made during 1.6.3 release cycle
[fw/altos]
/
ao-tools
/
lib
/
ao-hex.h
diff --git
a/ao-tools/lib/ao-hex.h
b/ao-tools/lib/ao-hex.h
index 9849746091f7c1c866d01992fbc15b2a51c5bc9e..a1ab490ceab707c30630241f91fa04cea6b69225 100644
(file)
--- a/
ao-tools/lib/ao-hex.h
+++ b/
ao-tools/lib/ao-hex.h
@@
-51,7
+51,6
@@
struct ao_hex_image {
struct ao_sym {
unsigned addr;
struct ao_sym {
unsigned addr;
- unsigned default_addr;
char *name;
bool required;
bool found;
char *name;
bool required;
bool found;
@@
-72,6
+71,9
@@
ao_hex_image_free(struct ao_hex_image *image);
struct ao_hex_image *
ao_hex_load(char *filename, struct ao_sym **symbols, int *num_symbols);
struct ao_hex_image *
ao_hex_load(char *filename, struct ao_sym **symbols, int *num_symbols);
+struct ao_hex_image *
+ao_hex_image_cat(struct ao_hex_image *a, struct ao_hex_image *b);
+
int
ao_hex_image_equal(struct ao_hex_image *a, struct ao_hex_image *b);
int
ao_hex_image_equal(struct ao_hex_image *a, struct ao_hex_image *b);