Deleted Added
full compact
if_ste.c (115528) if_ste.c (117208)
1/*
2 * Copyright (c) 1997, 1998, 1999
3 * Bill Paul <wpaul@ctr.columbia.edu>. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

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

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

26 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
27 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/pci/if_ste.c 115528 2003-05-31 19:58:45Z phk $");
34__FBSDID("$FreeBSD: head/sys/pci/if_ste.c 117208 2003-07-03 21:39:53Z imp $");
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/sockio.h>
39#include <sys/mbuf.h>
40#include <sys/malloc.h>
41#include <sys/kernel.h>
42#include <sys/socket.h>

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

924 */
925 if (pci_get_vendor(dev) == DL_VENDORID &&
926 pci_get_device(dev) == DL_DEVICEID_DL10050 &&
927 pci_get_revid(dev) == 0x12 )
928 sc->ste_one_phy = 1;
929
930 mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
931 MTX_DEF | MTX_RECURSE);
35
36#include <sys/param.h>
37#include <sys/systm.h>
38#include <sys/sockio.h>
39#include <sys/mbuf.h>
40#include <sys/malloc.h>
41#include <sys/kernel.h>
42#include <sys/socket.h>

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

924 */
925 if (pci_get_vendor(dev) == DL_VENDORID &&
926 pci_get_device(dev) == DL_DEVICEID_DL10050 &&
927 pci_get_revid(dev) == 0x12 )
928 sc->ste_one_phy = 1;
929
930 mtx_init(&sc->ste_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
931 MTX_DEF | MTX_RECURSE);
932
932#ifndef BURN_BRIDGES
933 /*
934 * Handle power management nonsense.
935 */
936 if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
937 u_int32_t iobase, membase, irq;
938
939 /* Save important PCI config data. */
940 iobase = pci_read_config(dev, STE_PCI_LOIO, 4);

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

947 pci_get_powerstate(dev));
948 pci_set_powerstate(dev, PCI_POWERSTATE_D0);
949
950 /* Restore PCI config data. */
951 pci_write_config(dev, STE_PCI_LOIO, iobase, 4);
952 pci_write_config(dev, STE_PCI_LOMEM, membase, 4);
953 pci_write_config(dev, STE_PCI_INTLINE, irq, 4);
954 }
933 /*
934 * Handle power management nonsense.
935 */
936 if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
937 u_int32_t iobase, membase, irq;
938
939 /* Save important PCI config data. */
940 iobase = pci_read_config(dev, STE_PCI_LOIO, 4);

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

947 pci_get_powerstate(dev));
948 pci_set_powerstate(dev, PCI_POWERSTATE_D0);
949
950 /* Restore PCI config data. */
951 pci_write_config(dev, STE_PCI_LOIO, iobase, 4);
952 pci_write_config(dev, STE_PCI_LOMEM, membase, 4);
953 pci_write_config(dev, STE_PCI_INTLINE, irq, 4);
954 }
955
955#endif
956 /*
957 * Map control/status registers.
958 */
959 pci_enable_busmaster(dev);
960
961 rid = STE_RID;
962 sc->ste_res = bus_alloc_resource(dev, STE_RES, &rid,
963 0, ~0, 1, RF_ACTIVE);

--- 683 unchanged lines hidden ---
956 /*
957 * Map control/status registers.
958 */
959 pci_enable_busmaster(dev);
960
961 rid = STE_RID;
962 sc->ste_res = bus_alloc_resource(dev, STE_RES, &rid,
963 0, ~0, 1, RF_ACTIVE);

--- 683 unchanged lines hidden ---