From owner-p4-projects@FreeBSD.ORG  Fri Apr 28 06:36:30 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 B32F616A404; Fri, 28 Apr 2006 06:36:30 +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 759F516A400
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:36:30 +0000 (UTC)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 41C2B43D45
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:36:30 +0000 (GMT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3S6aUaI034089
	for <perforce@freebsd.org>; Fri, 28 Apr 2006 06:36:30 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3S6aTLl034083
	for perforce@freebsd.org; Fri, 28 Apr 2006 06:36:29 GMT
	(envelope-from marcel@freebsd.org)
Date: Fri, 28 Apr 2006 06:36:29 GMT
Message-Id: <200604280636.k3S6aTLl034083@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 96291 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, 28 Apr 2006 06:36:30 -0000

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

Change 96291 by marcel@marcel_nfs on 2006/04/28 06:35:41

	Use NULL as the device for unassigned resources.

Affected files ...

.. //depot/projects/uart/dev/puc/puc.c#41 edit

Differences ...

==== //depot/projects/uart/dev/puc/puc.c#41 (text+ko) ====

@@ -276,7 +276,7 @@
 		rm = (bar->b_type == SYS_RES_IOPORT)
 		    ? &sc->sc_ioport: &sc->sc_iomem;
 		port->p_rres = rman_reserve_resource(rm, start + ofs,
-		    start + ofs + size - 1, size, 0, sc->sc_dev);
+		    start + ofs + size - 1, size, 0, NULL);
 		if (port->p_rres != NULL) {
 			bsh = rman_get_bushandle(bar->b_res);
 			bst = rman_get_bustag(bar->b_res);
@@ -285,7 +285,7 @@
 			rman_set_bustag(port->p_rres, bst);
 		}
 		port->p_ires = rman_reserve_resource(&sc->sc_irq, port->p_nr,
-		    port->p_nr, 1, 0, sc->sc_dev);
+		    port->p_nr, 1, 0, NULL);
 		if (port->p_ires == NULL) {
 			error = ENXIO;
 			goto fail;
@@ -490,7 +490,7 @@
 		return (NULL);
 
 	assigned = rman_get_device(res);
-	if (assigned == dev)	/* Not allocated */
+	if (assigned == NULL)	/* Not allocated */
 		rman_set_device(res, originator);
 	else if (assigned != originator)
 		return (NULL);
@@ -498,8 +498,8 @@
 	if (flags & RF_ACTIVE) {
 		error = rman_activate_resource(res);
 		if (error) {
-			if (assigned == dev)
-				rman_set_device(res, dev);
+			if (assigned == NULL)
+				rman_set_device(res, NULL);
 			return (NULL);
 		}
 	}
@@ -542,7 +542,7 @@
 		return (ENXIO);
 	if (rman_get_flags(res) & RF_ACTIVE)
 		rman_deactivate_resource(res);
-	rman_set_device(res, dev);
+	rman_set_device(res, NULL);
 	return (0);
 }