From owner-p4-projects@FreeBSD.ORG  Tue Apr 18 20:27:56 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 8D17116A411; Tue, 18 Apr 2006 20:27:56 +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 503F316A401
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:27:56 +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 AD7D043D6A
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:27:42 +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 k3IKRg8t060074
	for <perforce@freebsd.org>; Tue, 18 Apr 2006 20:27:42 GMT
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3IKRg0Z060071
	for perforce@freebsd.org; Tue, 18 Apr 2006 20:27:42 GMT
	(envelope-from marcel@freebsd.org)
Date: Tue, 18 Apr 2006 20:27:42 GMT
Message-Id: <200604182027.k3IKRg0Z060071@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 95523 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: Tue, 18 Apr 2006 20:27:56 -0000

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

Change 95523 by marcel@marcel_nfs on 2006/04/18 20:26:48

	o  Implement puc_bfe_detach().

Affected files ...

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

Differences ...

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

@@ -290,7 +290,46 @@
 int
 puc_bfe_detach(device_t dev)
 {
-	return (ENXIO);
+	struct puc_bar *bar;
+	struct puc_port *port;
+	struct puc_softc *sc;
+	int error, idx;
+
+	sc = device_get_softc(dev);
+
+	/* Detach our children. */
+	error = 0;
+	for (idx = 0; idx < sc->sc_nports; idx++) {
+		port = &sc->sc_port[idx];
+		if (port->p_dev == NULL)
+			continue;
+		if (device_detach(port->p_dev) == 0) {
+			device_delete_child(dev, port->p_dev);
+			if (port->p_rres != NULL)
+				rman_release_resource(port->p_rres);
+			if (port->p_ires != NULL)
+				rman_release_resource(port->p_ires);
+		} else
+			error = ENXIO;
+	}
+	if (error)
+		return (error);
+
+	bus_teardown_intr(dev, sc->sc_ires, sc->sc_icookie);
+	bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irid, sc->sc_ires);
+
+	for (idx = 0; idx < PUC_PCI_BARS; idx++) {
+		bar = &sc->sc_bar[idx];
+		if (bar->b_res != NULL)
+			bus_release_resource(sc->sc_dev, bar->b_type,
+			    bar->b_rid, bar->b_res);
+	}
+
+	rman_fini(&sc->sc_irq);
+	rman_fini(&sc->sc_iomem);
+	rman_fini(&sc->sc_ioport);
+	free(sc->sc_port, M_PUC);
+	return (0);
 }
 
 int