diff options
author | Soby Mathew <soby.mathew@arm.com> | 2020-01-17 17:41:21 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2020-01-17 17:41:21 +0000 |
commit | 45cc606ea7bbf8931be715a51c1819e7dd22e936 (patch) | |
tree | d0fc5d2abd7342373f56d406522115a218d8373b /include | |
parent | 5a4b090fccfa7ee7b06dc849dd1b9136a8d657c7 (diff) | |
parent | 70cb0bff7d42bd9e09dddef3c2fc6e3b385c6e5a (diff) | |
download | platform_external_arm-trusted-firmware-45cc606ea7bbf8931be715a51c1819e7dd22e936.tar.gz platform_external_arm-trusted-firmware-45cc606ea7bbf8931be715a51c1819e7dd22e936.tar.bz2 platform_external_arm-trusted-firmware-45cc606ea7bbf8931be715a51c1819e7dd22e936.zip |
Merge changes from topic "ld/mtd_framework" into integration
* changes:
io: change seek offset to signed long long
compiler_rt: Import aeabi_ldivmode.S file and dependencies
Diffstat (limited to 'include')
-rw-r--r-- | include/drivers/io/io_driver.h | 2 | ||||
-rw-r--r-- | include/drivers/io/io_storage.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/drivers/io/io_driver.h b/include/drivers/io/io_driver.h index 2b704f491..d8bb435aa 100644 --- a/include/drivers/io/io_driver.h +++ b/include/drivers/io/io_driver.h @@ -39,7 +39,7 @@ typedef struct io_dev_funcs { io_type_t (*type)(void); int (*open)(io_dev_info_t *dev_info, const uintptr_t spec, io_entity_t *entity); - int (*seek)(io_entity_t *entity, int mode, ssize_t offset); + int (*seek)(io_entity_t *entity, int mode, signed long long offset); int (*size)(io_entity_t *entity, size_t *length); int (*read)(io_entity_t *entity, uintptr_t buffer, size_t length, size_t *length_read); diff --git a/include/drivers/io/io_storage.h b/include/drivers/io/io_storage.h index 084c67c47..d40a828e1 100644 --- a/include/drivers/io/io_storage.h +++ b/include/drivers/io/io_storage.h @@ -86,7 +86,7 @@ int io_dev_close(uintptr_t dev_handle); /* Synchronous operations */ int io_open(uintptr_t dev_handle, const uintptr_t spec, uintptr_t *handle); -int io_seek(uintptr_t handle, io_seek_mode_t mode, ssize_t offset); +int io_seek(uintptr_t handle, io_seek_mode_t mode, signed long long offset); int io_size(uintptr_t handle, size_t *length); |