Switch from GPLv2 to GPLv2+

[fw/altos] / ao-tools / ao-stmload / ao-stmload.h

diff --git a/ao-tools/ao-stmload/ao-stmload.h b/ao-tools/ao-stmload/ao-stmload.h
index 98884535f6ecaf4926685d4d99e70a807b31d00b..bd59d66de4624b230ccf68ffd33d947ab70d1b78 100644 (file)
--- a/ao-tools/ao-stmload/ao-stmload.h
+++ b/ao-tools/ao-stmload/ao-stmload.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
@@ -18,16 +19,11 @@
 #ifndef _AO_STMLOAD_H_
 #define _AO_STMLOAD_H_
 
-struct sym {
-       unsigned        addr;
-       unsigned        default_addr;
-       char            *name;
-       int             required;
-};
+#include "ao-elf.h"
 
 #define AO_BOOT_APPLICATION_BASE       0x08001000
 
-extern struct sym ao_symbols[];
+extern struct ao_sym ao_symbols[];
 
 extern int ao_num_symbols;
 extern int ao_num_required_symbols;
@@ -38,12 +34,4 @@ ao_self_block_read(struct cc_usb *cc, uint32_t address, uint8_t block[256]);
 void
 ao_self_block_write(struct cc_usb *cc, uint32_t address, uint8_t block[256]);
 
-struct hex_image *
-ao_self_read(struct cc_usb *cc, uint32_t address, uint32_t length);
-
-int
-ao_self_write(struct cc_usb *cc, struct hex_image *image);
-
-extern int ao_self_verbose;
-
 #endif /* _AO_STMLOAD_H_ */