diff options
-rw-r--r-- | cli_classic.c | 2 | ||||
-rw-r--r-- | flash.h | 4 | ||||
-rw-r--r-- | layout.c | 2 | ||||
-rw-r--r-- | layout.h | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cli_classic.c b/cli_classic.c index 3b6fbf82..d69b7985 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -857,7 +857,7 @@ out: free(flashes[i].chip); } - layout_cleanup(&include_args); + cleanup_include_args(&include_args); free(filename); free(fmapfile); free(referencefile); @@ -417,10 +417,6 @@ __attribute__((format(printf, 2, 3))); #define msg_pspew(...) print(FLASHROM_MSG_SPEW, __VA_ARGS__) /* programmer debug spew */ #define msg_cspew(...) print(FLASHROM_MSG_SPEW, __VA_ARGS__) /* chip debug spew */ -/* layout.c */ -int register_include_arg(struct layout_include_args **args, const char *arg); -void layout_cleanup(struct layout_include_args **args); - /* spi.c */ struct spi_command { unsigned int writecnt; @@ -274,7 +274,7 @@ int included_regions_overlap(const struct flashrom_layout *const l) return overlap_detected; } -void layout_cleanup(struct layout_include_args **args) +void cleanup_include_args(struct layout_include_args **args) { struct layout_include_args *tmp; @@ -55,9 +55,12 @@ const struct flashrom_layout *get_layout(const struct flashrom_flashctx *const f int layout_from_file(struct flashrom_layout **, const char *name); +int register_include_arg(struct layout_include_args **args, const char *arg); +int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); +void cleanup_include_args(struct layout_include_args **args); + int get_region_range(struct flashrom_layout *const l, const char *name, unsigned int *start, unsigned int *len); -int process_include_args(struct flashrom_layout *l, const struct layout_include_args *const args); const struct romentry *layout_next_included_region(const struct flashrom_layout *, chipoff_t); const struct romentry *layout_next_included(const struct flashrom_layout *, const struct romentry *); const struct romentry *layout_next(const struct flashrom_layout *, const struct romentry *); |