From owner-svn-src-all@FreeBSD.ORG  Sun Feb 13 19:24:05 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27D69106566B;
	Sun, 13 Feb 2011 19:24:05 +0000 (UTC)
	(envelope-from marcel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 142698FC0A;
	Sun, 13 Feb 2011 19:24:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DJO4Jg049225;
	Sun, 13 Feb 2011 19:24:04 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DJO4YG049223;
	Sun, 13 Feb 2011 19:24:04 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201102131924.p1DJO4YG049223@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 13 Feb 2011 19:24:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r218660 - head/sys/dev/acpica/Osd
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Feb 2011 19:24:05 -0000

Author: marcel
Date: Sun Feb 13 19:24:04 2011
New Revision: 218660
URL: http://svn.freebsd.org/changeset/base/218660

Log:
  Use the preload_fetch_addr() and preload_fetch_size() convenience
  functions to obtain the address and size of the overriding DSDT.
  
  Sponsored by: Juniper Networks.

Modified:
  head/sys/dev/acpica/Osd/OsdTable.c

Modified: head/sys/dev/acpica/Osd/OsdTable.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdTable.c	Sun Feb 13 19:15:42 2011	(r218659)
+++ head/sys/dev/acpica/Osd/OsdTable.c	Sun Feb 13 19:24:04 2011	(r218660)
@@ -68,29 +68,31 @@ AcpiOsTableOverride(ACPI_TABLE_HEADER *E
     ACPI_TABLE_HEADER **NewTable)
 {
     char modname[] = "acpi_dsdt";
-    caddr_t acpi_table, p, s;
+    caddr_t acpi_table;
+    ACPI_TABLE_HEADER *hdr;
+    size_t sz;
 
     if (ExistingTable == NULL || NewTable == NULL)
 	return (AE_BAD_PARAMETER);
 
+    *NewTable = NULL;
 #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 (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0) {
-	*NewTable = NULL;
+    if (strncmp(ExistingTable->Signature, ACPI_SIG_DSDT, ACPI_NAME_SIZE) != 0)
 	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;
+    acpi_table = preload_search_by_type(modname);
+    if (acpi_table == NULL)
+	return (AE_OK);
+
+    hdr = preload_fetch_addr(acpi_table);
+    sz = preload_fetch_size(acpi_table);
+    if (hdr != NULL && sz != 0)
+	*NewTable = hdr;
 
     return (AE_OK);
 }