diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2010-11-18 13:59:33 +0100 |
---|---|---|
committer | Tobias Klauser <tklauser@distanz.ch> | 2010-11-18 13:59:33 +0100 |
commit | 6ee2297979fb8c18c3ba6161caf278b00724c47a (patch) | |
tree | 1f325b129880059bad3be6f02686aa512445525b | |
parent | d300de817dbf4a8e0a7e797ffe2d0cfd95f9bf19 (diff) |
Follow API changes...
-rw-r--r-- | image.c | 6 | ||||
-rw-r--r-- | image.h | 10 |
2 files changed, 9 insertions, 7 deletions
@@ -14,10 +14,10 @@ #include <errno.h> #include "nios2sim-ng.h" +#include "memory.h" #include "image.h" -int image_load(const char *image_path, int image_format, uint8_t *mem_base, - size_t mem_size) +int image_load(const char *image_path, int image_format, struct memory *mem) { FILE *fp; loader_func_t loader; @@ -41,7 +41,7 @@ int image_load(const char *image_path, int image_format, uint8_t *mem_base, return -1; } - ret = loader(fp, image_path, mem_base, mem_size); + ret = loader(fp, image_path, mem); fclose(fp); @@ -4,12 +4,14 @@ #ifndef _IMAGE_H_ #define _IMAGE_H_ -extern int image_load(const char *image_path, int image_format, uint8_t *mem_base, size_t mem_size); +#include "memory.h" + +extern int image_load(const char *image_path, int image_format, struct memory *mem); /* Image file loader functions */ -typedef int (*loader_func_t)(FILE *, const char *, uint8_t *, size_t); -extern int srec_load(FILE *fp, const char *name, uint8_t *mem_base, size_t mem_size); -extern int elf_load(FILE *fp, const char *name, uint8_t *mem_base, size_t mem_size); +typedef int (*loader_func_t)(FILE *, const char *, struct memory *); +extern int srec_load(FILE *fp, const char *name, struct memory *mem); +extern int elf_load(FILE *fp, const char *name, struct memory *mem); enum { FORMAT_SREC, |