diff options
| author | riastradh <riastradh@NetBSD.org> | 2023-05-22 16:27:48 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2023-05-22 16:27:48 +0000 |
| commit | 80fbbf7d5697b81a69b0dfb89d796e2c9fd74a9e (patch) | |
| tree | 49cb3051ae4f7a51ecd2be88e5a59203028f76ce /sys | |
| parent | 303d418b2e71d9c68514a99a503939b4c028546f (diff) | |
efi(4): Move error macros to efi.h.
PR kern/57076
XXX pullup-10
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/arm/arm/efi_runtime.c | 13 | ||||
| -rw-r--r-- | sys/arch/x86/x86/efi_machdep.c | 16 | ||||
| -rw-r--r-- | sys/dev/efi.c | 20 | ||||
| -rw-r--r-- | sys/dev/efi/efi.h | 18 |
4 files changed, 23 insertions, 44 deletions
diff --git a/sys/arch/arm/arm/efi_runtime.c b/sys/arch/arm/arm/efi_runtime.c index e7b95a0822f..054fbc876f3 100644 --- a/sys/arch/arm/arm/efi_runtime.c +++ b/sys/arch/arm/arm/efi_runtime.c @@ -1,4 +1,4 @@ -/* $NetBSD: efi_runtime.c,v 1.10 2022/10/15 11:19:23 jmcneill Exp $ */ +/* $NetBSD: efi_runtime.c,v 1.11 2023/05/22 16:27:48 riastradh Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -32,7 +32,7 @@ #include "efi.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.10 2022/10/15 11:19:23 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.11 2023/05/22 16:27:48 riastradh Exp $"); #include <sys/param.h> #include <sys/mutex.h> @@ -45,15 +45,6 @@ __KERNEL_RCSID(0, "$NetBSD: efi_runtime.c,v 1.10 2022/10/15 11:19:23 jmcneill Ex #include <arm/arm/efi_runtime.h> #include <arm/bootconfig.h> -#ifdef _LP64 -#define EFIERR(x) (0x8000000000000000 | x) -#else -#define EFIERR(x) (0x80000000 | x) -#endif - -#define EFI_UNSUPPORTED EFIERR(3) -#define EFI_DEVICE_ERROR EFIERR(7) - static kmutex_t efi_lock; static struct efi_rt *RT; #if BYTE_ORDER == LITTLE_ENDIAN diff --git a/sys/arch/x86/x86/efi_machdep.c b/sys/arch/x86/x86/efi_machdep.c index e7e1c259590..6e2b275529f 100644 --- a/sys/arch/x86/x86/efi_machdep.c +++ b/sys/arch/x86/x86/efi_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: efi_machdep.c,v 1.4 2022/12/24 15:23:02 andvar Exp $ */ +/* $NetBSD: efi_machdep.c,v 1.5 2023/05/22 16:27:48 riastradh Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.4 2022/12/24 15:23:02 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efi_machdep.c,v 1.5 2023/05/22 16:27:48 riastradh Exp $"); #include "efi.h" #include "opt_efi.h" @@ -582,18 +582,6 @@ efi_get_e820memmap(void) #ifdef EFI_RUNTIME /* - * XXX move to sys/dev/efi/efi.h - */ -#ifdef _LP64 -#define EFIERR(x) (0x8000000000000000ul | (x)) -#else -#define EFIERR(x) (0x80000000ul | (x)) -#endif - -#define EFI_UNSUPPORTED EFIERR(3) -#define EFI_DEVICE_ERROR EFIERR(7) - -/* * efi_runtime_init() * * Set up kernel access to EFI runtime services: diff --git a/sys/dev/efi.c b/sys/dev/efi.c index 5c80ea4f462..e6bd1b5ab94 100644 --- a/sys/dev/efi.c +++ b/sys/dev/efi.c @@ -1,4 +1,4 @@ -/* $NetBSD: efi.c,v 1.5 2023/05/22 16:27:39 riastradh Exp $ */ +/* $NetBSD: efi.c,v 1.6 2023/05/22 16:27:49 riastradh Exp $ */ /*- * Copyright (c) 2021 Jared McNeill <jmcneill@invisible.ca> @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.5 2023/05/22 16:27:39 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.6 2023/05/22 16:27:49 riastradh Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -42,22 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.5 2023/05/22 16:27:39 riastradh Exp $"); #include <dev/efivar.h> -#ifdef _LP64 -#define EFIERR(x) (0x8000000000000000 | (x)) -#else -#define EFIERR(x) (0x80000000 | (x)) -#endif - -#define EFI_SUCCESS 0 -#define EFI_INVALID_PARAMETER EFIERR(2) -#define EFI_UNSUPPORTED EFIERR(3) -#define EFI_BUFFER_TOO_SMALL EFIERR(5) -#define EFI_DEVICE_ERROR EFIERR(7) -#define EFI_WRITE_PROTECTED EFIERR(8) -#define EFI_OUT_OF_RESOURCES EFIERR(9) -#define EFI_NOT_FOUND EFIERR(14) -#define EFI_SECURITY_VIOLATION EFIERR(26) - #include "ioconf.h" /* diff --git a/sys/dev/efi/efi.h b/sys/dev/efi/efi.h index 1f7fe910d06..a88a19cd064 100644 --- a/sys/dev/efi/efi.h +++ b/sys/dev/efi/efi.h @@ -1,4 +1,4 @@ -/* $NetBSD: efi.h,v 1.2 2022/09/22 14:46:37 riastradh Exp $ */ +/* $NetBSD: efi.h,v 1.3 2023/05/22 16:27:49 riastradh Exp $ */ /*- * Copyright (c) 2004 Marcel Moolenaar @@ -44,6 +44,22 @@ #define EFIAPI /* empty */ #endif +#ifdef _LP64 +#define EFIERR(x) (0x8000000000000000 | (x)) +#else +#define EFIERR(x) (0x80000000 | (x)) +#endif + +#define EFI_SUCCESS 0 +#define EFI_INVALID_PARAMETER EFIERR(2) +#define EFI_UNSUPPORTED EFIERR(3) +#define EFI_BUFFER_TOO_SMALL EFIERR(5) +#define EFI_DEVICE_ERROR EFIERR(7) +#define EFI_WRITE_PROTECTED EFIERR(8) +#define EFI_OUT_OF_RESOURCES EFIERR(9) +#define EFI_NOT_FOUND EFIERR(14) +#define EFI_SECURITY_VIOLATION EFIERR(26) + enum efi_reset { EFI_RESET_COLD, EFI_RESET_WARM, |
