diff options
Diffstat (limited to 'ubi-utils')
| -rw-r--r-- | ubi-utils/include/libubi.h | 5 | ||||
| -rw-r--r-- | ubi-utils/libubi.c | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ubi-utils/include/libubi.h b/ubi-utils/include/libubi.h index dc03d02..11a186b 100644 --- a/ubi-utils/include/libubi.h +++ b/ubi-utils/include/libubi.h @@ -426,18 +426,17 @@ int ubi_update_start(libubi_t desc, int fd, long long bytes); * @fd: volume character device file descriptor * @lnum: LEB number to change * @bytes: how many bytes of new data will be written to the LEB - * @dtype: data type (%UBI_LONGTERM, %UBI_SHORTTERM, %UBI_UNKNOWN) * * This function initiates atomic LEB change operation and returns %0 in case * of success and %-1 in case of error. he caller is assumed to write @bytes * data to the volume @fd afterward. */ -int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes, int dtype); +int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes); /** * ubi_set_property - set volume propety. * @fd: volume character device file descriptor - * @property: the property to change (%UBI_PROP_DIRECT_WRITE, etc) + * @property: the property to change (%UBI_VOL_PROP_DIRECT_WRITE, etc) * @value: new value of the changed property * * This function changes a property of a volume. Returns zero in case of diff --git a/ubi-utils/libubi.c b/ubi-utils/libubi.c index c898e36..7736dd4 100644 --- a/ubi-utils/libubi.c +++ b/ubi-utils/libubi.c @@ -1106,7 +1106,7 @@ int ubi_update_start(libubi_t desc, int fd, long long bytes) return 0; } -int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes, int dtype) +int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes) { struct ubi_leb_change_req req; @@ -1114,7 +1114,7 @@ int ubi_leb_change_start(libubi_t desc, int fd, int lnum, int bytes, int dtype) memset(&req, 0, sizeof(struct ubi_leb_change_req)); req.lnum = lnum; req.bytes = bytes; - req.dtype = dtype; + req.dtype = 3; if (ioctl(fd, UBI_IOCEBCH, &req)) return -1; @@ -1346,13 +1346,13 @@ int ubi_get_vol_info1_nm(libubi_t desc, int dev_num, const char *name, int ubi_set_property(int fd, uint8_t property, uint64_t value) { - struct ubi_set_prop_req r; + struct ubi_set_vol_prop_req r; - memset(&r, 0, sizeof(struct ubi_set_prop_req)); + memset(&r, 0, sizeof(struct ubi_set_vol_prop_req)); r.property = property; r.value = value; - return ioctl(fd, UBI_IOCSETPROP, &r); + return ioctl(fd, UBI_IOCSETVOLPROP, &r); } int ubi_leb_unmap(int fd, int lnum) |