Make #include guard naming consistent

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

diff --git a/src/target/image.h b/src/target/image.h
index 20d31518c3fbee5e6130a08b20e32bfa85839a2a..9bf7af35d82b2947350eb2ce0bce138d67cb4353 100644 (file)
--- 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
-{
+struct imagesection {
        uint32_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;
+};
 
-struct image_binary
-{
-       struct fileio fileio;
+struct image_binary {
+       struct fileio *fileio;
 };
 
-struct image_ihex
-{
-       struct fileio fileio;
+struct image_ihex {
+       struct fileio *fileio;
        uint8_t *buffer;
 };
 
-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 */