diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-05-06 09:30:28 +0200 |
| commit | 3cdd18632e72cbb8b0402df3e4821dfd7d24643b (patch) | |
| tree | f08e34403f164601555130f7663c7316be8f255a /include | |
| parent | a20caf6c579563007f8a65be96ca23f5ea4c2097 (diff) | |
| parent | 67c6eeda9e5dea544cdeddb666f141c8467ab8d4 (diff) | |
| download | barebox-3cdd18632e72cbb8b0402df3e4821dfd7d24643b.tar.gz barebox-3cdd18632e72cbb8b0402df3e4821dfd7d24643b.tar.xz | |
Merge branch 'for-next/memory-commands'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/common.h b/include/common.h index e559b94a71..59fcd35ac1 100644 --- a/include/common.h +++ b/include/common.h @@ -219,7 +219,12 @@ int run_shell(void); #define PAGE_ALIGN(s) (((s) + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1)) #define PAGE_ALIGN_DOWN(x) ((x) & ~(PAGE_SIZE - 1)) -int memory_display(char *addr, loff_t offs, ulong nbytes, int size, int swab); +int memory_display(char *addr, loff_t offs, unsigned nbytes, int size, int swab); + +int mem_parse_options(int argc, char *argv[], char *optstr, int *mode, + char **sourcefile, char **destfile, int *swab); +int open_and_lseek(const char *filename, int mode, loff_t pos); +#define RW_BUF_SIZE (unsigned)4096 extern const char version_string[]; #ifdef CONFIG_BANNER |