aboutsummaryrefslogtreecommitdiff
path: root/lib/semihosting
diff options
context:
space:
mode:
authorDan Handley <dan.handley@arm.com>2014-04-23 13:47:06 +0100
committerDan Handley <dan.handley@arm.com>2014-05-06 17:55:38 +0100
commit625de1d4f04b30383354bee944d0a7ca3dba1e67 (patch)
tree3a9c8494e30f1d7475dbc69edef172a37f036594 /lib/semihosting
parent408c37682a0233c8c4fa88700b603f0b09d6361f (diff)
downloadtrusted-firmware-a-625de1d4f04b30383354bee944d0a7ca3dba1e67.tar.gz
Remove variables from .data section
Update code base to remove variables from the .data section, mainly by using const static data where possible and adding the const specifier as required. Most changes are to the IO subsystem, including the framework APIs. The FVP power management code is also affected. Delay initialization of the global static variable, next_image_type in bl31_main.c, until it is realy needed. Doing this moves the variable from the .data to the .bss section. Also review the IO interface for inconsistencies, using uintptr_t where possible instead of void *. Remove the io_handle and io_dev_handle typedefs, which were unnecessary, replacing instances with uintptr_t. Fixes ARM-software/tf-issues#107. Change-Id: I085a62197c82410b566e4698e5590063563ed304
Diffstat (limited to 'lib/semihosting')
-rw-r--r--lib/semihosting/semihosting.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/semihosting/semihosting.c b/lib/semihosting/semihosting.c
index 1bce377cf3..3c9db2217b 100644
--- a/lib/semihosting/semihosting.c
+++ b/lib/semihosting/semihosting.c
@@ -48,7 +48,7 @@ typedef struct {
typedef struct {
long handle;
- void *buffer;
+ uintptr_t buffer;
size_t length;
} smh_file_read_write_block_t;
@@ -96,12 +96,12 @@ long semihosting_file_seek(long file_handle, ssize_t offset)
return result;
}
-long semihosting_file_read(long file_handle, size_t *length, void *buffer)
+long semihosting_file_read(long file_handle, size_t *length, uintptr_t buffer)
{
smh_file_read_write_block_t read_block;
long result = -EINVAL;
- if ((length == NULL) || (buffer == NULL))
+ if ((length == NULL) || (buffer == (uintptr_t)NULL))
return result;
read_block.handle = file_handle;
@@ -122,15 +122,15 @@ long semihosting_file_read(long file_handle, size_t *length, void *buffer)
long semihosting_file_write(long file_handle,
size_t *length,
- const void *buffer)
+ const uintptr_t buffer)
{
smh_file_read_write_block_t write_block;
- if ((length == NULL) || (buffer == NULL))
+ if ((length == NULL) || (buffer == (uintptr_t)NULL))
return -EINVAL;
write_block.handle = file_handle;
- write_block.buffer = (void *)buffer;
+ write_block.buffer = (uintptr_t)buffer; /* cast away const */
write_block.length = *length;
*length = semihosting_call(SEMIHOSTING_SYS_WRITE,
@@ -196,7 +196,7 @@ long semihosting_get_flen(const char *file_name)
long semihosting_download_file(const char *file_name,
size_t buf_size,
- void *buf)
+ uintptr_t buf)
{
long ret = -EINVAL;
size_t length;