From owner-svn-src-head@FreeBSD.ORG  Thu Feb  5 19:38:31 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 607D610656C8;
	Thu,  5 Feb 2009 19:38:31 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4E3538FC14;
	Thu,  5 Feb 2009 19:38:31 +0000 (UTC) (envelope-from imp@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 n15JcVon036406;
	Thu, 5 Feb 2009 19:38:31 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n15JcVRh036405;
	Thu, 5 Feb 2009 19:38:31 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200902051938.n15JcVRh036405@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Thu, 5 Feb 2009 19:38:31 +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: r188179 - head/sys/dev/pccard
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Feb 2009 19:38:32 -0000

Author: imp
Date: Thu Feb  5 19:38:31 2009
New Revision: 188179
URL: http://svn.freebsd.org/changeset/base/188179

Log:
  Fix parameter types for set_res_flags and read_ivars

Modified:
  head/sys/dev/pccard/pccard.c

Modified: head/sys/dev/pccard/pccard.c
==============================================================================
--- head/sys/dev/pccard/pccard.c	Thu Feb  5 19:37:49 2009	(r188178)
+++ head/sys/dev/pccard/pccard.c	Thu Feb  5 19:38:31 2009	(r188179)
@@ -105,14 +105,14 @@ static int	pccard_get_resource(device_t 
 static void	pccard_delete_resource(device_t dev, device_t child, int type,
 		    int rid);
 static int	pccard_set_res_flags(device_t dev, device_t child, int type,
-		    int rid, uint32_t flags);
+		    int rid, u_long flags);
 static int	pccard_set_memory_offset(device_t dev, device_t child, int rid,
 		    uint32_t offset, uint32_t *deltap);
 static int	pccard_probe_and_attach_child(device_t dev, device_t child,
 		    struct pccard_function *pf);
 static void	pccard_probe_nomatch(device_t cbdev, device_t child);
 static int	pccard_read_ivar(device_t bus, device_t child, int which,
-		    u_char *result);
+		    uintptr_t *result);
 static void	pccard_driver_added(device_t dev, driver_t *driver);
 static struct resource *pccard_alloc_resource(device_t dev,
 		    device_t child, int type, int *rid, u_long start,
@@ -972,7 +972,7 @@ pccard_delete_resource(device_t dev, dev
 
 static int
 pccard_set_res_flags(device_t dev, device_t child, int type, int rid,
-    uint32_t flags)
+    u_long flags)
 {
 	return (CARD_SET_RES_FLAGS(device_get_parent(dev), child, type,
 	    rid, flags));
@@ -1055,7 +1055,7 @@ pccard_child_pnpinfo_str(device_t bus, d
 }
 
 static int
-pccard_read_ivar(device_t bus, device_t child, int which, u_char *result)
+pccard_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct pccard_ivar *devi = PCCARD_IVAR(child);
 	struct pccard_function *pf = devi->pf;