[src/trunk]: src/sys/external/bsd/drm2/include/linux drm: Move Linux ACPI cas...

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

details:   https://anonhg.NetBSD.org/src/rev/1dc13ebfb5c7
branches:  trunk
changeset: 362440:1dc13ebfb5c7
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Feb 27 14:22:42 2022 +0000

description:
drm: Move Linux ACPI case aliases to new nbsd-namespace-acpi.h.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c  |  13 +---
 sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h |  47 +++++++++++++++
 2 files changed, 50 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 23b8dc329614 -r 1dc13ebfb5c7 sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c  Sun Feb 27 14:22:29 2022 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c  Sun Feb 27 14:22:42 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_acpi.c,v 1.7 2022/02/27 14:22:21 riastradh Exp $ */
+/*     $NetBSD: intel_acpi.c,v 1.8 2022/02/27 14:22:42 riastradh Exp $ */
 
 // SPDX-License-Identifier: GPL-2.0
 /*
@@ -8,7 +8,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_acpi.c,v 1.7 2022/02/27 14:22:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_acpi.c,v 1.8 2022/02/27 14:22:42 riastradh Exp $");
 
 #include <linux/pci.h>
 #include <linux/acpi.h>
@@ -24,14 +24,7 @@
 
 #include <dev/acpi/acpi_pci.h>
 
-#define acpi_handle    ACPI_HANDLE
-#define        buffer          Buffer
-#define        count           Count
-#define        elements        Elements
-#define        integer         Integer
-#define        package         Package
-#define        pointer         Pointer
-#define        value           Value
+#include <linux/nbsd-namespace-acpi.h>
 #endif
 
 #define INTEL_DSM_REVISION_ID 1 /* For Calpella anyway... */
diff -r 23b8dc329614 -r 1dc13ebfb5c7 sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h Sun Feb 27 14:22:42 2022 +0000
@@ -0,0 +1,47 @@
+/*     $NetBSD: nbsd-namespace-acpi.h,v 1.1 2022/02/27 14:22:42 riastradh Exp $        */
+
+/*-
+ * Copyright (c) 2022 The NetBSD Foundation, Inc.
+ * 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifndef _LINUX_NBSD_NAMESPACE_ACPI_H_
+#define _LINUX_NBSD_NAMESPACE_ACPI_H_
+
+#define        buffer          Buffer
+#define        count           Count
+#define        elements        Elements
+#define        integer         Integer
+#define        length          Length
+#define        package         Package
+#define        pointer         Pointer
+#define        type            Type
+#define        value           Value
+
+#define        acpi_get_handle         AcpiGetHandle
+#define        acpi_get_table          AcpiGetTable
+#define        acpi_evaluate_object    AcpiEvaluateObject
+#define        acpi_format_exception   AcpiFormatException
+
+#endif  /* _LINUX_NBSD_NAMESPACE_ACPI_H_ */