ioutil: make the file compile on MacOS

[fw/openocd] / src / target / image.h

diff --git a/src/target/image.h b/src/target/image.h
index 47f0215f64e46bad4474b35da3932081c55326da..19993fa81db4b2d5fbcf86544c5128e49e1e841d 100644 (file)
--- 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     *
@@ -17,95 +23,86 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <helper/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_MAX_SECTIONS                     (512)
 
 #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 */
-    IMAGE_SRECORD,     /* motorola s19 */
-    IMAGE_BUILDER,     /* when building a new image */
-} image_type_t;
-
-typedef struct image_section_s
-{
-       u32 base_address;
-       u32 size;
+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 */
+};
+
+struct imagesection {
+       uint32_t base_address;
+       uint32_t size;
        int flags;
        void *private;          /* private data */
-} image_section_t;
+};
 
-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 */
-       image_section_t *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 */
-       u32 start_address;              /* start address, if one is set */
-       char error_str[IMAGE_MAX_ERROR_STRING];
-} image_t;
-
-typedef struct image_binary_s
-{
-       fileio_t fileio;
-} image_binary_t;
-
-typedef struct image_ihex_s
-{
-       fileio_t fileio;
-       u8 *buffer;
-} image_ihex_t;
-
-typedef struct image_memory_s
-{
-       target_t *target;
-       u8 *cache;
-       u32 cache_address;
-} image_memory_t;
-
-typedef struct fileio_elf_s
-{
-       fileio_t fileio;
+       uint32_t start_address;         /* start address, if one is set */
+};
+
+struct image_binary {
+       struct fileio fileio;
+};
+
+struct image_ihex {
+       struct fileio fileio;
+       uint8_t *buffer;
+};
+
+struct image_memory {
+       struct target *target;
+       uint8_t *cache;
+       uint32_t cache_address;
+};
+
+struct image_elf {
+       struct fileio fileio;
        Elf32_Ehdr *header;
        Elf32_Phdr *segments;
-       u32 segment_count;
-       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 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);
+       uint32_t segment_count;
+       uint8_t endianness;
+};
+
+struct image_mot {
+       struct fileio fileio;
+       uint8_t *buffer;
+};
+
+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(struct image *image, uint32_t base, uint32_t size,
+               int flags, uint8_t *data);
+
+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)