jtag: linuxgpiod: drop extra parenthesis

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

diff --git a/src/target/image.h b/src/target/image.h
index c3bce9e36d8ae32ca9dea2f5c1112253aaa6ec60..03bc068d62ffa9b50d1fe7f05c61b5ae5f07d388 100644 (file)
--- a/src/target/image.h
+++ b/src/target/image.h
@@ -1,3 +1,5 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
 /***************************************************************************
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
@@ -8,24 +10,15 @@
  *   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     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   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, see <http://www.gnu.org/licenses/>. *
+ *   Copyright (C) 2018 by Advantest                                       *
+ *   florian.meister@advantest.com                                         *
  ***************************************************************************/
 
-#ifndef IMAGE_H
-#define IMAGE_H
+#ifndef OPENOCD_TARGET_IMAGE_H
+#define OPENOCD_TARGET_IMAGE_H
 
 #include <helper/fileio.h>
+#include <helper/replacements.h>
 
 #ifdef HAVE_ELF_H
 #include <elf.h>
@@ -46,20 +39,20 @@ enum image_type {
 };
 
 struct imagesection {
-       uint32_t base_address;
+       target_addr_t base_address;
        uint32_t size;
-       int flags;
+       uint64_t flags;
        void *private;          /* private data */
 };
 
 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 */
+       unsigned int num_sections;              /* number of sections contained in the image */
        struct imagesection *sections;  /* array of sections */
-       int base_address_set;   /* whether the image has a base address set (for relocation purposes) */
+       bool base_address_set;  /* whether the image has a base address set (for relocation purposes) */
        long long base_address;         /* base address, if one is set */
-       int start_address_set;  /* whether the image has a start address (entry point) associated */
+       bool start_address_set; /* whether the image has a start address (entry point) associated */
        uint32_t start_address;         /* start address, if one is set */
 };
 
@@ -80,8 +73,15 @@ struct image_memory {
 
 struct image_elf {
        struct fileio *fileio;
-       Elf32_Ehdr *header;
-       Elf32_Phdr *segments;
+       bool is_64_bit;
+       union {
+               Elf32_Ehdr *header32;
+               Elf64_Ehdr *header64;
+       };
+       union {
+               Elf32_Phdr *segments32;
+               Elf64_Phdr *segments64;
+       };
        uint32_t segment_count;
        uint8_t endianness;
 };
@@ -92,14 +92,14 @@ 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,
+int image_read_section(struct image *image, int section, target_addr_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 const *data);
+int image_add_section(struct image *image, target_addr_t base, uint32_t size,
+               uint64_t flags, uint8_t const *data);
 
-int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes,
+int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes,
                uint32_t *checksum);
 
 #define ERROR_IMAGE_FORMAT_ERROR       (-1400)
@@ -107,4 +107,4 @@ int image_calculate_checksum(uint8_t *buffer, uint32_t nbytes,
 #define ERROR_IMAGE_TEMPORARILY_UNAVAILABLE            (-1402)
 #define ERROR_IMAGE_CHECKSUM           (-1403)
 
-#endif /* IMAGE_H */
+#endif /* OPENOCD_TARGET_IMAGE_H */