diff options
| author | danh-arm <dan.handley@arm.com> | 2015-07-17 10:16:51 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-07-17 10:16:51 +0100 |
| commit | 6058ee6a21d48eb6d126a36009c9320809abdaf5 (patch) | |
| tree | 05c1c7af54d5db6a67190c8a5a43236d495d8175 | |
| parent | 1f06ca8a63bfb81ffb099ac0e425cc4dd7a44a66 (diff) | |
| parent | 31833aff6802a4b5bdc3b7007ce8b1871991e796 (diff) | |
Merge pull request #335 from jcastillo-arm/jc/sh_write
Fix bug in semihosting write function
| -rw-r--r-- | drivers/io/io_semihosting.c | 9 | ||||
| -rw-r--r-- | lib/semihosting/semihosting.c | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 3c92c6d7..8e62be1d 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -183,7 +183,6 @@ static int sh_file_read(io_entity_t *entity, uintptr_t buffer, size_t length, static int sh_file_write(io_entity_t *entity, const uintptr_t buffer, size_t length, size_t *length_written) { - int result = IO_FAIL; long sh_result = -1; long file_handle; size_t bytes = length; @@ -196,13 +195,9 @@ static int sh_file_write(io_entity_t *entity, const uintptr_t buffer, sh_result = semihosting_file_write(file_handle, &bytes, buffer); - if (sh_result >= 0) { - *length_written = sh_result; - result = IO_SUCCESS; - } else - result = IO_FAIL; + *length_written = length - bytes; - return result; + return (sh_result == 0) ? IO_SUCCESS : IO_FAIL; } diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c index 849ec120..b4f53d25 100644 --- a/lib/semihosting/semihosting.c +++ b/lib/semihosting/semihosting.c @@ -125,6 +125,7 @@ long semihosting_file_write(long file_handle, const uintptr_t buffer) { smh_file_read_write_block_t write_block; + long result = -EINVAL; if ((length == NULL) || (buffer == (uintptr_t)NULL)) return -EINVAL; @@ -133,10 +134,12 @@ long semihosting_file_write(long file_handle, write_block.buffer = (uintptr_t)buffer; /* cast away const */ write_block.length = *length; - *length = semihosting_call(SEMIHOSTING_SYS_WRITE, + result = semihosting_call(SEMIHOSTING_SYS_WRITE, (void *) &write_block); - return *length; + *length = result; + + return (result == 0) ? 0 : -EINVAL; } long semihosting_file_close(long file_handle) |