From owner-svn-src-projects@FreeBSD.ORG  Thu Jun  4 20:53:26 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B4CD1065677;
	Thu,  4 Jun 2009 20:53:26 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 897D18FC28;
	Thu,  4 Jun 2009 20:53:26 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n54KrQZT003655;
	Thu, 4 Jun 2009 20:53:26 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n54KrQ9l003654;
	Thu, 4 Jun 2009 20:53:26 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906042053.n54KrQ9l003654@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 4 Jun 2009 20:53:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193454 - projects/acpica_20090521/sys/dev/acpica/Osd
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Jun 2009 20:53:27 -0000

Author: jkim
Date: Thu Jun  4 20:53:26 2009
New Revision: 193454
URL: http://svn.freebsd.org/changeset/base/193454

Log:
  Fix ACPI table override.  Since ACPI CA 20090123, any ACPI table can be
  overriden, not just DSDT.  However, we do not support this feature yet.

Modified:
  projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c

Modified: projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c
==============================================================================
--- projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 20:48:31 2009	(r193453)
+++ projects/acpica_20090521/sys/dev/acpica/Osd/OsdTable.c	Thu Jun  4 20:53:26 2009	(r193454)
@@ -67,17 +67,30 @@ ACPI_STATUS
 AcpiOsTableOverride(ACPI_TABLE_HEADER *ExistingTable,
     ACPI_TABLE_HEADER **NewTable)
 {
-    caddr_t acpi_dsdt, p;
+    char modname[] = "acpi_dsdt";
+    caddr_t acpi_table, p, s;
 
     if (ExistingTable == NULL || NewTable == NULL)
 	return (AE_BAD_PARAMETER);
 
+#ifdef notyet
+    for (int i = 0; i < ACPI_NAME_SIZE; i++)
+	modname[i + 5] = tolower(ExistingTable->Signature[i]);
+#else
     /* If we're not overriding the DSDT, just return. */
-    if ((acpi_dsdt = preload_search_by_type("acpi_dsdt")) == NULL ||
-	(p = preload_search_info(acpi_dsdt, MODINFO_ADDR)) == NULL) {
+    if (strncmp(ExistingTable->Signature, "DSDT", ACPI_NAME_SIZE) != 0) {
 	*NewTable = NULL;
-    } else
+	return (AE_OK);
+    }
+#endif
+
+    if ((acpi_table = preload_search_by_type(modname)) != NULL &&
+	(p = preload_search_info(acpi_table, MODINFO_ADDR)) != NULL &&
+	(s = preload_search_info(acpi_table, MODINFO_SIZE)) != NULL &&
+	*(size_t *)s != 0)
 	*NewTable = *(ACPI_TABLE_HEADER **)p;
+    else
+	*NewTable = NULL;
 
     return (AE_OK);
 }