From owner-p4-projects@FreeBSD.ORG  Wed Aug  1 21:42:42 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 38AF216A468; Wed,  1 Aug 2007 21:42:42 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EADC416A41F
	for <perforce@FreeBSD.org>; Wed,  1 Aug 2007 21:42:41 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D8E7213C457
	for <perforce@FreeBSD.org>; Wed,  1 Aug 2007 21:42:41 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l71Lgfcv084897
	for <perforce@FreeBSD.org>; Wed, 1 Aug 2007 21:42:41 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l71LgfPb084894
	for perforce@freebsd.org; Wed, 1 Aug 2007 21:42:41 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Wed, 1 Aug 2007 21:42:41 GMT
Message-Id: <200708012142.l71LgfPb084894@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 124491 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: Wed, 01 Aug 2007 21:42:42 -0000

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

Change 124491 by cnst@dale on 2007/08/01 21:41:46

	add lm_isa_detach for upcoming lm(4) module, which
	will allow to test more logic from kern_sensors.c

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#3 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#3 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#2 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#3 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: lm78_isa.c,v 1.2 2007/07/01 21:48:57 cnst Exp $	*/
 
@@ -62,6 +62,7 @@
 
 static int lm_isa_probe(struct device *);
 static int lm_isa_attach(struct device *);
+static int lm_isa_detach(struct device *);
 u_int8_t lm_isa_readreg(struct lm_softc *, int);
 void lm_isa_writereg(struct lm_softc *, int, int);
 
@@ -69,6 +70,7 @@
 	/* Methods from the device interface */
 	DEVMETHOD(device_probe,         lm_isa_probe),
 	DEVMETHOD(device_attach,        lm_isa_attach),
+	DEVMETHOD(device_detach,        lm_isa_detach),
 
 	/* Terminate method list */
 	{ 0, 0 }
@@ -222,6 +224,20 @@
 	return (0);
 }
 
+int
+lm_isa_detach(struct device *dev)
+{
+	struct lm_isa_softc *sc = device_get_softc(dev);
+	int error;
+
+	/* Bus-independent detachment */
+	error = lm_detach(&sc->sc_lmsc);
+
+	bus_space_unmap(sc->sc_iot, sc->sc_ioh, 8);
+
+	return (error);
+}
+
 u_int8_t
 lm_isa_readreg(struct lm_softc *lmsc, int reg)
 {