From owner-svn-src-all@FreeBSD.ORG  Sun Feb 13 19:25:49 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 4D5AE106564A;
	Sun, 13 Feb 2011 19:25:49 +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 3BF688FC16;
	Sun, 13 Feb 2011 19:25:49 +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 p1DJPnGZ049327;
	Sun, 13 Feb 2011 19:25:49 GMT (envelope-from marcel@svn.freebsd.org)
Received: (from marcel@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DJPnDO049325;
	Sun, 13 Feb 2011 19:25:49 GMT (envelope-from marcel@svn.freebsd.org)
Message-Id: <201102131925.p1DJPnDO049325@svn.freebsd.org>
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Sun, 13 Feb 2011 19:25:49 +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: r218661 - head/sys/dev/fb
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:25:49 -0000

Author: marcel
Date: Sun Feb 13 19:25:48 2011
New Revision: 218661
URL: http://svn.freebsd.org/changeset/base/218661

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

Modified:
  head/sys/dev/fb/splash.c

Modified: head/sys/dev/fb/splash.c
==============================================================================
--- head/sys/dev/fb/splash.c	Sun Feb 13 19:24:04 2011	(r218660)
+++ head/sys/dev/fb/splash.c	Sun Feb 13 19:25:48 2011	(r218661)
@@ -59,26 +59,28 @@ static void		*splash_arg;
 static int
 splash_find_data(splash_decoder_t *decoder)
 {
-        caddr_t image_module;
-	caddr_t p;
+	caddr_t image_module;
+	void *ptr;
+	size_t sz;
 
 	if (decoder->data_type == NULL)
-		return 0;
+		return (0);
+
 	image_module = preload_search_by_type(decoder->data_type);
 	if (image_module == NULL)
-		return ENOENT;
-	p = preload_search_info(image_module, MODINFO_ADDR);
-	if (p == NULL)
-		return ENOENT;
-	decoder->data = *(void **)p;
-	p = preload_search_info(image_module, MODINFO_SIZE);
-	if (p == NULL)
-		return ENOENT;
-	decoder->data_size = *(size_t *)p;
+		return (ENOENT);
+
+	ptr = preload_fetch_addr(image_module);
+	sz = preload_fetch_size(image_module);
+	if (ptr == NULL || sz == 0)
+		return (ENOENT);
+
 	if (bootverbose)
-		printf("splash: image@%p, size:%lu\n",
-		       (void *)decoder->data, (long)decoder->data_size);
-	return 0;
+		printf("splash: image@%p, size:%zu\n", ptr, sz);
+
+	decoder->data = ptr;
+	decoder->data_size = sz;
+	return (0);
 }
 
 static int