projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem_ap: fix a potential memory leak in mem_ap_target_create()
[fw/openocd]
/
src
/
target
/
image.h
diff --git
a/src/target/image.h
b/src/target/image.h
index b096031b02017ba10e0a9b7928ccb2374f129437..9907a5f3fbca180b080d46eae257632b5d4f07a2 100644
(file)
--- a/
src/target/image.h
+++ b/
src/target/image.h
@@
-19,12
+19,11
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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
+
+#ifndef OPENOCD_TARGET_IMAGE_H
+#define OPENOCD_TARGET_IMAGE_H
#include <helper/fileio.h>
#include <helper/fileio.h>
@@
-37,8
+36,7
@@
#define IMAGE_MEMORY_CACHE_SIZE (2048)
#define IMAGE_MEMORY_CACHE_SIZE (2048)
-enum image_type
-{
+enum image_type {
IMAGE_BINARY, /* plain binary */
IMAGE_IHEX, /* intel hex-record format */
IMAGE_MEMORY, /* target-memory pseudo-image */
IMAGE_BINARY, /* plain binary */
IMAGE_IHEX, /* intel hex-record format */
IMAGE_MEMORY, /* target-memory pseudo-image */
@@
-47,56
+45,49
@@
enum image_type
IMAGE_BUILDER, /* when building a new image */
};
IMAGE_BUILDER, /* when building a new image */
};
-struct imageection
-{
- uint32_t base_address;
+struct imagesection {
+ target_addr_t base_address;
uint32_t size;
int flags;
void *private; /* private data */
};
uint32_t size;
int flags;
void *private; /* private data */
};
-struct image
-{
+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 */
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
ection *sections;
/* array of sections */
+ struct image
section *sections;
/* array of sections */
int 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 */
uint32_t start_address; /* start address, if one is set */
};
int 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 */
uint32_t start_address; /* start address, if one is set */
};
-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;
};
uint8_t *buffer;
};
-struct image_memory
-{
+struct image_memory {
struct target *target;
uint8_t *cache;
uint32_t cache_address;
};
struct target *target;
uint8_t *cache;
uint32_t cache_address;
};
-struct image_elf
-{
- struct fileio fileio;
+struct image_elf {
+ struct fileio *fileio;
Elf32_Ehdr *header;
Elf32_Phdr *segments;
uint32_t segment_count;
uint8_t endianness;
};
Elf32_Ehdr *header;
Elf32_Phdr *segments;
uint32_t segment_count;
uint8_t endianness;
};
-struct image_mot
-{
- struct fileio fileio;
+struct image_mot {
+ struct fileio *fileio;
uint8_t *buffer;
};
uint8_t *buffer;
};
@@
-106,14
+97,14
@@
int image_read_section(struct image *image, int section, uint32_t offset,
void image_close(struct image *image);
int image_add_section(struct image *image, uint32_t base, uint32_t size,
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 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)
#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 */