Deleted Added
full compact
if_cm_isa.c (121816) if_cm_isa.c (147256)
1/* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
2
3#include <sys/cdefs.h>
1/* $NetBSD: if_bah_zbus.c,v 1.6 2000/01/23 21:06:12 aymeric Exp $ */
2
3#include <sys/cdefs.h>
4__FBSDID("$FreeBSD: head/sys/dev/cm/if_cm_isa.c 121816 2003-10-31 18:32:15Z brooks $");
4__FBSDID("$FreeBSD: head/sys/dev/cm/if_cm_isa.c 147256 2005-06-10 16:49:24Z brooks $");
5
6/*-
7 * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
8 * All rights reserved.
9 *
10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Ignatios Souvatzis.
12 *

--- 85 unchanged lines hidden (view full) ---

98
99 return cm_attach(dev);
100}
101
102static int
103cm_isa_detach(device_t dev)
104{
105 struct cm_softc *sc = device_get_softc(dev);
5
6/*-
7 * Copyright (c) 1994, 1995, 1998 The NetBSD Foundation, Inc.
8 * All rights reserved.
9 *
10 * This code is derived from software contributed to The NetBSD Foundation
11 * by Ignatios Souvatzis.
12 *

--- 85 unchanged lines hidden (view full) ---

98
99 return cm_attach(dev);
100}
101
102static int
103cm_isa_detach(device_t dev)
104{
105 struct cm_softc *sc = device_get_softc(dev);
106 struct ifnet *ifp = &sc->sc_arccom.ac_if;
106 struct ifnet *ifp = sc->sc_ifp;
107 int s;
108
109 cm_stop(sc);
110 ifp->if_flags &= ~IFF_RUNNING;
111
112 s = splimp();
107 int s;
108
109 cm_stop(sc);
110 ifp->if_flags &= ~IFF_RUNNING;
111
112 s = splimp();
113 arc_ifdetach(&sc->sc_arccom.ac_if);
113 arc_ifdetach(ifp);
114 if_free(ifp);
114 splx(s);
115
116 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
117 cm_release_resources(dev);
118
119 return (0);
120}
121

--- 17 unchanged lines hidden ---
115 splx(s);
116
117 bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
118 cm_release_resources(dev);
119
120 return (0);
121}
122

--- 17 unchanged lines hidden ---