Resolve conflicts arising from the ACPI CA 20020611 import.

1 files changed, 71 insertions, 0 deletions

diff --git a/sys/dev/acpica/Osd/OsdTable.c b/sys/dev/acpica/Osd/OsdTable.c
new file mode 100644
index 0000000..a70e73e
--- /dev/null
+++ b/sys/dev/acpica/Osd/OsdTable.c
@@ -0,0 +1,71 @@
+/*-
+ * Copyright (c) 2002 Mitsaru Iwasaki
+ * 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$
+ */
+
+/*
+ * ACPI Table interfaces
+ */
+
+#include "acpi.h"
+
+#include <sys/kernel.h>
+#include <sys/linker.h>
+
+#undef _COMPONENT
+#define _COMPONENT      ACPI_TABLES
+
+ACPI_STATUS
+AcpiOsTableOverride (
+    ACPI_TABLE_HEADER       *ExistingTable,
+    ACPI_TABLE_HEADER       **NewTable)
+{
+    caddr_t                 acpi_dsdt, p;
+
+    if (NewTable == NULL)
+    {
+        return(AE_BAD_PARAMETER);
+    }
+
+    (*NewTable) = NULL;
+
+    if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL)
+    {
+        return(AE_OK);
+    }
+        
+    if ((p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL)
+    {
+        return(AE_OK);
+    }
+
+    (*NewTable) = *(void **)p;
+
+    printf("ACPI: DSDT was overridden.\n");
+
+    return(AE_OK);
+}
+