altos: Remove unused ao_adc_get from ao_adc_stm.c

[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..3cd0813b7fdacffd1a0262c3126192acb1a41a5c 100644 (file)
--- a/ao-tools/lib/ao-hex.h
+++ b/ao-tools/lib/ao-hex.h
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -51,7 +52,6 @@ struct ao_hex_image {
 
 struct ao_sym {
        unsigned        addr;
-       unsigned        default_addr;
        char            *name;
        bool            required;
        bool            found;
@@ -72,6 +72,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_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);