From owner-p4-projects@FreeBSD.ORG  Fri Jun  2 06:50:46 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CFB716A458; Fri,  2 Jun 2006 06:50:46 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 791C416A43A
	for <perforce@freebsd.org>; Fri,  2 Jun 2006 06:50:46 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4AC9843D46
	for <perforce@freebsd.org>; Fri,  2 Jun 2006 06:50:46 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k526nGwF045636
	for <perforce@freebsd.org>; Fri, 2 Jun 2006 06:49:16 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k526nG1b045633
	for perforce@freebsd.org; Fri, 2 Jun 2006 06:49:16 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 2 Jun 2006 06:49:16 GMT
Message-Id: <200606020649.k526nG1b045633@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 98317 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jun 2006 06:50:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=98317

Change 98317 by imp@imp_lighthouse on 2006/06/02 06:49:01

	Implement resource activation.

Affected files ...

.. //depot/projects/arm/src/sys/dev/sdhc/sdhc_pci.c#5 edit

Differences ...

==== //depot/projects/arm/src/sys/dev/sdhc/sdhc_pci.c#5 (text+ko) ====

@@ -116,17 +116,22 @@
 }
 
 static int
-sdhc_activate_resource(device_t brdev, device_t child, int type, int rid,
+sdhc_activate_resource(device_t dev, device_t child, int type, int rid,
     struct resource *r)
 {
-	return (EIO);
+	if (rid != 0 || type != SYS_RES_MEMORY ||
+	    device_get_parent(child) != dev || rman_get_device(r) != dev)
+		return (EINVAL);
+	rman_set_device(r, child);
+	return (0);
 }
 
 static int
-sdhc_deactivate_resource(device_t brdev, device_t child, int type,
+sdhc_deactivate_resource(device_t dev, device_t child, int type,
     int rid, struct resource *r)
 {
-	return (EIO);
+	rman_set_device(r, dev);
+	return (0);
 }
 
 static void