warnings: fix alignment warnings

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

diff --git a/src/target/image.h b/src/target/image.h
index 55f0ea29cd56960a7c2f798e7ea4f8282cb65b02..b096031b02017ba10e0a9b7928ccb2374f129437 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -26,7 +26,7 @@
 #ifndef IMAGE_H
 #define IMAGE_H
 
-#include "fileio.h"
+#include <helper/fileio.h>
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
@@ -62,7 +62,7 @@ struct image
        int num_sections;               /* number of sections contained in the image */
        struct imageection *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 */
 };
@@ -80,7 +80,7 @@ struct image_ihex
 
 struct image_memory
 {
-       struct target_s *target;
+       struct target *target;
        uint8_t *cache;
        uint32_t cache_address;
 };
@@ -102,7 +102,7 @@ struct image_mot
 
 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, uint32_t *size_read);
+               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,