X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fimage.h;h=9907a5f3fbca180b080d46eae257632b5d4f07a2;hp=746f3d24a17714a18ad90830286d8decfac5cd9f;hb=8795090edcf7b83e65f07941b0186c63a358c31a;hpb=24df46d0676630c90f04ee49b96533f5fddca6cd

diff --git a/src/target/image.h b/src/target/image.h
index 746f3d24a1..9907a5f3fb 100644
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -19,14 +19,13 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef IMAGE_H
-#define IMAGE_H
 
-#include "fileio.h"
+#ifndef OPENOCD_TARGET_IMAGE_H
+#define OPENOCD_TARGET_IMAGE_H
+
+#include <helper/fileio.h>
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
@@ -37,83 +36,75 @@
 
 #define IMAGE_MEMORY_CACHE_SIZE		(2048)
 
-typedef enum image_type
-{
+enum image_type {
 	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;
+};
 
-struct image_section
-{
-	uint32_t base_address;
+struct imagesection {
+	target_addr_t base_address;
 	uint32_t size;
 	int flags;
 	void *private;		/* private data */
 };
 
-typedef struct image_s
-{
-	image_type_t type;		/* image type (plain, ihex, ...) */
+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 */
-	struct image_section *sections;	/* array of sections */
+	struct imagesection *sections;	/* array of sections */
 	int base_address_set;	/* whether the image has a base address set (for relocation purposes) */
-	int base_address;		/* base address, if one is set */
+	long long base_address;		/* base address, if one is set */
 	int start_address_set;	/* whether the image has a start address (entry point) associated */
 	uint32_t start_address;		/* start address, if one is set */
-} image_t;
+};
 
-typedef struct image_binary_s
-{
-	struct fileio fileio;
-} image_binary_t;
+struct image_binary {
+	struct fileio *fileio;
+};
 
-typedef struct image_ihex_s
-{
-	struct fileio fileio;
+struct image_ihex {
+	struct fileio *fileio;
 	uint8_t *buffer;
-} image_ihex_t;
+};
 
-typedef struct image_memory_s
-{
-	struct target_s *target;
+struct image_memory {
+	struct target *target;
 	uint8_t *cache;
 	uint32_t cache_address;
-} image_memory_t;
+};
 
-typedef struct fileio_elf_s
-{
-	struct fileio fileio;
+struct image_elf {
+	struct fileio *fileio;
 	Elf32_Ehdr *header;
 	Elf32_Phdr *segments;
 	uint32_t segment_count;
 	uint8_t endianness;
-} image_elf_t;
+};
 
-typedef struct image_mot_s
-{
-	struct fileio fileio;
+struct image_mot {
+	struct fileio *fileio;
 	uint8_t *buffer;
-} image_mot_t;
+};
 
-int image_open(image_t *image, const char *url, const char *type_string);
-int image_read_section(image_t *image, int section, uint32_t offset,
-		uint32_t size, uint8_t *buffer, uint32_t *size_read);
-void image_close(image_t *image);
+int image_open(struct image *image, const char *url, const char *type_string);
+int image_read_section(struct image *image, int section, uint32_t offset,
+		uint32_t size, uint8_t *buffer, size_t *size_read);
+void image_close(struct image *image);
 
-int image_add_section(image_t *image, uint32_t base, uint32_t size,
-		int flags, uint8_t *data);
+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,
-		uint32_t* checksum);
+int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes,
+		uint32_t *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 */
+#endif /* OPENOCD_TARGET_IMAGE_H */