X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Fimage.h;h=855cb215e7dfffdd1b499cf181d1c18808131942;hb=56504fdd7353732525e34f1e3fbd44346588f979;hp=07931472ec525a7e990ec4aa51fcecf4921fe605;hpb=4b97f3cbb9603c13f69f8d3b5371c12045593126;p=fw%2Fopenocd

diff --git a/src/target/image.h b/src/target/image.h
index 07931472e..855cb215e 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -2,6 +2,12 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
+ *   Copyright (C) 2008 by Spencer Oliver                                  *
+ *   spen@spen-soft.co.uk                                                  *
+ *                                                                         *
  *   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; either version 2 of the License, or     *
@@ -20,32 +26,25 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include "fileio.h"
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
 #endif
-#include "replacements.h"
-#include "fileio.h"
-#include "target.h"
 
 #define IMAGE_MAX_ERROR_STRING		(256)
 #define IMAGE_MAX_SECTIONS			(128)
 
-#define IMAGE_MEMORY_CACHE_SIZE		(128)
+#define IMAGE_MEMORY_CACHE_SIZE		(2048)
 
 typedef enum image_type
 {
-    IMAGE_BINARY,	/* plain binary */
-    IMAGE_IHEX,		/* intel hex-record format */
-    IMAGE_MEMORY,	/* target-memory pseudo-image */
-    IMAGE_ELF,		/* ELF binary */
-/*
- * Possible future enhancements:
- * IMAGE_SRECORD,
- */
+	IMAGE_BINARY,	/* plain binary */
+	IMAGE_IHEX,		/* intel hex-record format */
+	IMAGE_MEMORY,	/* target-memory pseudo-image */
+	IMAGE_ELF,		/* ELF binary */
+	IMAGE_SRECORD,	/* motorola s19 */
+	IMAGE_BUILDER,	/* when building a new image */
 } image_type_t;
 
 typedef struct image_section_s
@@ -66,7 +65,6 @@ typedef struct image_s
 	int base_address;		/* base address, if one is set */
 	int start_address_set;	/* whether the image has a start address (entry point) associated */
 	u32 start_address;		/* start address, if one is set */
-	char error_str[IMAGE_MAX_ERROR_STRING];
 } image_t;
 
 typedef struct image_binary_s
@@ -82,7 +80,7 @@ typedef struct image_ihex_s
 
 typedef struct image_memory_s
 {
-	target_t *target;
+	struct target_s *target;
 	u8 *cache;
 	u32 cache_address;
 } image_memory_t;
@@ -96,12 +94,22 @@ typedef struct fileio_elf_s
 	u8 endianness;
 } image_elf_t;
 
+typedef struct image_mot_s
+{
+	fileio_t fileio;
+	u8 *buffer;
+} image_mot_t;
+
 extern int image_open(image_t *image, char *url, char *type_string);
 extern int image_read_section(image_t *image, int section, u32 offset, u32 size, u8 *buffer, u32 *size_read);
-extern int image_close(image_t *image);
+extern void image_close(image_t *image);
+extern int image_add_section(image_t *image, u32 base, u32 size, int flags, u8 *data);
+
+extern int image_calculate_checksum(u8* buffer, u32 nbytes, u32* checksum);
 
 #define ERROR_IMAGE_FORMAT_ERROR	(-1400)
 #define ERROR_IMAGE_TYPE_UNKNOWN	(-1401)
 #define ERROR_IMAGE_TEMPORARILY_UNAVAILABLE		(-1402)
+#define ERROR_IMAGE_CHECKSUM		(-1403)
 
 #endif /* IMAGE_H */