scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-10 17:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from jcastillo-arm/jc/sh_write

Browse Source 
Fix bug in semihosting write function
This commit is contained in:
danh-arm
2015-07-17 10:16:51 +01:00
parent 1f06ca8a63 31833aff68
commit 6058ee6a21
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/io/io_semihosting.c
View File

@@ -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;
}

7
lib/semihosting/semihosting.c
View File

@@ -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)