X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fimage.h;h=53c27d8129e06431f60e3969df70a390ca9dcb07;hb=e44539d66c8929679321704768125df9ba7d5f67;hp=5aeba2f7937c2ddfd70a5f60442c201b72ec6d64;hpb=9b2577742cc49683ab0ea8506d93e3e285b53bbd;p=fw%2Fopenocd

diff --git a/src/target/image.h b/src/target/image.h
index 5aeba2f79..53c27d812 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -19,13 +19,11 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
-#ifndef IMAGE_H
-#define IMAGE_H
+#ifndef OPENOCD_TARGET_IMAGE_H
+#define OPENOCD_TARGET_IMAGE_H
 
 #include <helper/fileio.h>
 
@@ -48,7 +46,7 @@ enum image_type {
 };
 
 struct imagesection {
-	uint32_t base_address;
+	target_addr_t base_address;
 	uint32_t size;
 	int flags;
 	void *private;		/* private data */
@@ -57,20 +55,20 @@ struct imagesection {
 struct image {
 	enum image_type type;		/* image type (plain, ihex, ...) */
 	void *type_private;		/* type private data */
-	int num_sections;		/* number of sections contained in the image */
+	unsigned int num_sections;		/* number of sections contained in the image */
 	struct imagesection *sections;	/* array of sections */
-	int base_address_set;	/* whether the image has a base address set (for relocation purposes) */
+	bool base_address_set;	/* whether the image has a base address set (for relocation purposes) */
 	long long base_address;		/* base address, if one is set */
-	int start_address_set;	/* whether the image has a start address (entry point) associated */
+	bool start_address_set;	/* whether the image has a start address (entry point) associated */
 	uint32_t start_address;		/* start address, if one is set */
 };
 
 struct image_binary {
-	struct fileio fileio;
+	struct fileio *fileio;
 };
 
 struct image_ihex {
-	struct fileio fileio;
+	struct fileio *fileio;
 	uint8_t *buffer;
 };
 
@@ -81,7 +79,7 @@ struct image_memory {
 };
 
 struct image_elf {
-	struct fileio fileio;
+	struct fileio *fileio;
 	Elf32_Ehdr *header;
 	Elf32_Phdr *segments;
 	uint32_t segment_count;
@@ -89,7 +87,7 @@ struct image_elf {
 };
 
 struct image_mot {
-	struct fileio fileio;
+	struct fileio *fileio;
 	uint8_t *buffer;
 };
 
@@ -101,7 +99,7 @@ void image_close(struct image *image);
 int image_add_section(struct image *image, uint32_t base, uint32_t size,
 		int flags, uint8_t const *data);
 
-int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes,
+int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes,
 		uint32_t *checksum);
 
 #define ERROR_IMAGE_FORMAT_ERROR	(-1400)
@@ -109,4 +107,4 @@ int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes,
 #define ERROR_IMAGE_TEMPORARILY_UNAVAILABLE		(-1402)
 #define ERROR_IMAGE_CHECKSUM		(-1403)
 
-#endif /* IMAGE_H */
+#endif /* OPENOCD_TARGET_IMAGE_H */