diff options
| -rw-r--r-- | include/drivers/console.h | 6 | ||||
| -rw-r--r-- | include/lib/stdlib/stdbool.h | 44 | ||||
| -rw-r--r-- | services/spd/trusty/generic-arm64-smcall.c | 12 |
3 files changed, 18 insertions, 44 deletions
diff --git a/include/drivers/console.h b/include/drivers/console.h index 6e7ebbf9..f9ed2e56 100644 --- a/include/drivers/console.h +++ b/include/drivers/console.h @@ -39,9 +39,9 @@ typedef struct console { * fields of the struct to 64 bits in AArch64 and 32 bits in AArch32 */ u_register_t flags; - int (*putc)(int character, struct console *console); - int (*getc)(struct console *console); - int (*flush)(struct console *console); + int (*const putc)(int character, struct console *console); + int (*const getc)(struct console *console); + int (*const flush)(struct console *console); /* Additional private driver data may follow here. */ } console_t; #include <console_assertions.h> /* offset macro assertions for console_t */ diff --git a/include/lib/stdlib/stdbool.h b/include/lib/stdlib/stdbool.h index 48070c18..e39aef7d 100644 --- a/include/lib/stdlib/stdbool.h +++ b/include/lib/stdlib/stdbool.h @@ -1,43 +1,17 @@ /* - * Copyright (c) 2000 Jeroen Ruigrok van der Werven <asmodai@FreeBSD.org> - * All rights reserved. + * Copyright (c) 2018, ARM Limited and Contributors. All rights reserved. * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD$ + * SPDX-License-Identifier: BSD-3-Clause */ -#ifndef __bool_true_false_are_defined -#define __bool_true_false_are_defined 1 +#ifndef STDBOOL_H +#define STDBOOL_H -#ifndef __cplusplus +#define bool _Bool -#define false 0 -#define true 1 +#define true 1 +#define false 0 -#define bool _Bool -#if __STDC_VERSION__ < 199901L && __GNUC__ < 3 && !defined(__INTEL_COMPILER) -typedef int _Bool; -#endif +#define __bool_true_false_are_defined 1 -#endif /* !__cplusplus */ -#endif /* __bool_true_false_are_defined */ +#endif /* STDBOOL_H */ diff --git a/services/spd/trusty/generic-arm64-smcall.c b/services/spd/trusty/generic-arm64-smcall.c index 38da279e..feeecaa4 100644 --- a/services/spd/trusty/generic-arm64-smcall.c +++ b/services/spd/trusty/generic-arm64-smcall.c @@ -57,14 +57,14 @@ static uint64_t trusty_get_reg_base(uint32_t reg) } } -static uint64_t trusty_generic_platform_smc(uint32_t smc_fid, - uint64_t x1, - uint64_t x2, - uint64_t x3, - uint64_t x4, +static uintptr_t trusty_generic_platform_smc(uint32_t smc_fid, + u_register_t x1, + u_register_t x2, + u_register_t x3, + u_register_t x4, void *cookie, void *handle, - uint64_t flags) + u_register_t flags) { switch (smc_fid) { case SMC_FC_DEBUG_PUTC: |