[src/trunk]: src/sys/dev/efi efi(4): Move error macros to efi.h.

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43fdfa005d42
branches:  trunk
changeset: 375942:43fdfa005d42
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Mon May 22 16:27:48 2023 +0000

description:
efi(4): Move error macros to efi.h.

PR kern/57076

XXX pullup-10

diffstat:

 sys/arch/arm/arm/efi_runtime.c |  13 ++-----------
 sys/arch/x86/x86/efi_machdep.c |  16 ++--------------
 sys/dev/efi.c                  |  20 ++------------------
 sys/dev/efi/efi.h              |  18 +++++++++++++++++-
 4 files changed, 23 insertions(+), 44 deletions(-)

diffs (144 lines):

diff -r d3ac578abd82 -r 43fdfa005d42 sys/arch/arm/arm/efi_runtime.c
--- a/sys/arch/arm/arm/efi_runtime.c    Mon May 22 16:27:39 2023 +0000
+++ b/sys/arch/arm/arm/efi_runtime.c    Mon May 22 16:27:48 2023 +0000
@@ -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 @@
 #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 -r d3ac578abd82 -r 43fdfa005d42 sys/arch/x86/x86/efi_machdep.c
--- a/sys/arch/x86/x86/efi_machdep.c    Mon May 22 16:27:39 2023 +0000
+++ b/sys/arch/x86/x86/efi_machdep.c    Mon May 22 16:27:48 2023 +0000
@@ -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 -r d3ac578abd82 -r 43fdfa005d42 sys/dev/efi.c
--- a/sys/dev/efi.c     Mon May 22 16:27:39 2023 +0000
+++ b/sys/dev/efi.c     Mon May 22 16:27:48 2023 +0000
@@ -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@localhost>
@@ -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 @@
 
 #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 -r d3ac578abd82 -r 43fdfa005d42 sys/dev/efi/efi.h
--- a/sys/dev/efi/efi.h Mon May 22 16:27:39 2023 +0000
+++ b/sys/dev/efi/efi.h Mon May 22 16:27:48 2023 +0000
@@ -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,