Module Name: src
Committed By: riastradh
Date: Sun Feb 27 14:22:42 UTC 2022
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915/display: intel_acpi.c
Added Files:
src/sys/external/bsd/drm2/include/linux: nbsd-namespace-acpi.h
Log Message:
drm: Move Linux ACPI case aliases to new nbsd-namespace-acpi.h.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c
cvs rdiff -u -r0 -r1.1 \
src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c:1.7 Sun Feb 27 14:22:21 2022
+++ src/sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.c Sun Feb 27 14:22:42 2022
@@ -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 @@ ACPI_MODULE_NAME("acpi_intel_brightness"
#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... */
Added files:
Index: src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h
diff -u /dev/null src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h:1.1
--- /dev/null Sun Feb 27 14:22:42 2022
+++ src/sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h Sun Feb 27 14:22:42 2022
@@ -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_ */
