diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-06-11 11:33:34 +0200 |
| commit | 06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8 (patch) | |
| tree | 3c7c238c81aa91405159959906f31f6195aa6217 /include | |
| parent | b697fba4a5c5395a9db271efa286870191418040 (diff) | |
| parent | b917f7864115a35fbb9e69af2c1d553a110a37fc (diff) | |
| download | barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.gz barebox-06b8bc4d708b8ff4eba1dd9b48ec110a8019d2c8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/common.h | 2 | ||||
| -rw-r--r-- | include/driver.h | 4 | ||||
| -rw-r--r-- | include/libbb.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/common.h b/include/common.h index 723b9c706c..b1294978d7 100644 --- a/include/common.h +++ b/include/common.h @@ -116,6 +116,8 @@ void shutdown_barebox(void); int mem_parse_options(int argc, char *argv[], char *optstr, int *mode, char **sourcefile, char **destfile, int *swab); +int memcpy_parse_options(int argc, char *argv[], int *sourcefd, + int *destfd, loff_t *count); #define RW_BUF_SIZE (unsigned)4096 extern const char version_string[]; diff --git a/include/driver.h b/include/driver.h index 3479e18194..26ec413bd6 100644 --- a/include/driver.h +++ b/include/driver.h @@ -489,8 +489,8 @@ int cdev_erase(struct cdev *cdev, loff_t count, loff_t offset); #define DEVFS_PARTITION_FIXED (1U << 0) #define DEVFS_PARTITION_READONLY (1U << 1) -#define DEVFS_IS_CHARACTER_DEV (1 << 3) -#define DEVFS_PARTITION_FROM_TABLE (1 << 4) +#define DEVFS_IS_CHARACTER_DEV (1U << 3) +#define DEVFS_PARTITION_FROM_TABLE (1U << 4) struct cdev *devfs_add_partition(const char *devname, loff_t offset, loff_t size, unsigned int flags, const char *name); diff --git a/include/libbb.h b/include/libbb.h index 1f6afaa27a..d05c190637 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -29,6 +29,4 @@ char * safe_strncpy(char *dst, const char *src, size_t size); int process_escape_sequence(const char *source, char *dest, int destlen); -char *simple_itoa(unsigned int i); - #endif /* __LIBBB_H */ |