Deleted Added
full compact
if_sis.c (150968) if_sis.c (151297)
1/*-
2 * Copyright (c) 2005 Poul-Henning Kamp <phk@FreeBSD.org>
3 * Copyright (c) 1997, 1998, 1999
4 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
31 * THE POSSIBILITY OF SUCH DAMAGE.
32 */
33
34#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2005 Poul-Henning Kamp <phk@FreeBSD.org>
3 * Copyright (c) 1997, 1998, 1999
4 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
31 * THE POSSIBILITY OF SUCH DAMAGE.
32 */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: head/sys/pci/if_sis.c 150968 2005-10-05 10:09:17Z glebius $");
35__FBSDID("$FreeBSD: head/sys/pci/if_sis.c 151297 2005-10-13 21:11:20Z ru $");
36
37/*
38 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
39 * available from http://www.sis.com.tw.
40 *
41 * This driver also supports the NatSemi DP83815. Datasheets are
42 * available from http://www.national.com.
43 *

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

1269 if (device_is_attached(dev)) {
1270 SIS_LOCK(sc);
1271 sis_reset(sc);
1272 sis_stop(sc);
1273 SIS_UNLOCK(sc);
1274 callout_drain(&sc->sis_stat_ch);
1275 ether_ifdetach(ifp);
1276 }
36
37/*
38 * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are
39 * available from http://www.sis.com.tw.
40 *
41 * This driver also supports the NatSemi DP83815. Datasheets are
42 * available from http://www.national.com.
43 *

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

1269 if (device_is_attached(dev)) {
1270 SIS_LOCK(sc);
1271 sis_reset(sc);
1272 sis_stop(sc);
1273 SIS_UNLOCK(sc);
1274 callout_drain(&sc->sis_stat_ch);
1275 ether_ifdetach(ifp);
1276 }
1277 if (ifp)
1278 if_free(ifp);
1279 if (sc->sis_miibus)
1280 device_delete_child(dev, sc->sis_miibus);
1281 bus_generic_detach(dev);
1282
1283 if (sc->sis_intrhand)
1284 bus_teardown_intr(dev, sc->sis_res[1], sc->sis_intrhand);
1285 bus_release_resources(dev, sis_res_spec, sc->sis_res);
1286
1277 if (sc->sis_miibus)
1278 device_delete_child(dev, sc->sis_miibus);
1279 bus_generic_detach(dev);
1280
1281 if (sc->sis_intrhand)
1282 bus_teardown_intr(dev, sc->sis_res[1], sc->sis_intrhand);
1283 bus_release_resources(dev, sis_res_spec, sc->sis_res);
1284
1285 if (ifp)
1286 if_free(ifp);
1287
1287 if (sc->sis_rx_tag) {
1288 bus_dmamap_unload(sc->sis_rx_tag,
1289 sc->sis_rx_dmamap);
1290 bus_dmamem_free(sc->sis_rx_tag,
1291 sc->sis_rx_list, sc->sis_rx_dmamap);
1292 bus_dma_tag_destroy(sc->sis_rx_tag);
1293 }
1294 if (sc->sis_tx_tag) {

--- 1007 unchanged lines hidden ---
1288 if (sc->sis_rx_tag) {
1289 bus_dmamap_unload(sc->sis_rx_tag,
1290 sc->sis_rx_dmamap);
1291 bus_dmamem_free(sc->sis_rx_tag,
1292 sc->sis_rx_list, sc->sis_rx_dmamap);
1293 bus_dma_tag_destroy(sc->sis_rx_tag);
1294 }
1295 if (sc->sis_tx_tag) {

--- 1007 unchanged lines hidden ---