Deleted Added
full compact
if_jme.c (183264) if_jme.c (183814)
1/*-
2 * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
3 * 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

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
3 * 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

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/dev/jme/if_jme.c 183264 2008-09-22 06:17:21Z yongari $");
29__FBSDID("$FreeBSD: head/sys/dev/jme/if_jme.c 183814 2008-10-13 01:11:28Z yongari $");
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/bus.h>
34#include <sys/endian.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/mbuf.h>

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

619 }
620
621 error = bus_alloc_resources(dev, sc->jme_irq_spec, sc->jme_irq);
622 if (error != 0) {
623 device_printf(dev, "cannot allocate IRQ resources.\n");
624 goto fail;
625 }
626
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/bus.h>
34#include <sys/endian.h>
35#include <sys/kernel.h>
36#include <sys/malloc.h>
37#include <sys/mbuf.h>

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

619 }
620
621 error = bus_alloc_resources(dev, sc->jme_irq_spec, sc->jme_irq);
622 if (error != 0) {
623 device_printf(dev, "cannot allocate IRQ resources.\n");
624 goto fail;
625 }
626
627 sc->jme_rev = pci_get_revid(dev);
628 if (sc->jme_rev == DEVICEID_JMC260) {
627 sc->jme_rev = pci_get_device(dev);
628 if ((sc->jme_rev & DEVICEID_JMC2XX_MASK) == DEVICEID_JMC260) {
629 sc->jme_flags |= JME_FLAG_FASTETH;
630 sc->jme_flags |= JME_FLAG_NOJUMBO;
631 }
632 reg = CSR_READ_4(sc, JME_CHIPMODE);
633 sc->jme_chip_rev = (reg & CHIPMODE_REV_MASK) >> CHIPMODE_REV_SHIFT;
634 if (((reg & CHIPMODE_FPGA_REV_MASK) >> CHIPMODE_FPGA_REV_SHIFT) !=
635 CHIPMODE_NOT_FPGA)
636 sc->jme_flags |= JME_FLAG_FPGA;

--- 2473 unchanged lines hidden ---
629 sc->jme_flags |= JME_FLAG_FASTETH;
630 sc->jme_flags |= JME_FLAG_NOJUMBO;
631 }
632 reg = CSR_READ_4(sc, JME_CHIPMODE);
633 sc->jme_chip_rev = (reg & CHIPMODE_REV_MASK) >> CHIPMODE_REV_SHIFT;
634 if (((reg & CHIPMODE_FPGA_REV_MASK) >> CHIPMODE_FPGA_REV_SHIFT) !=
635 CHIPMODE_NOT_FPGA)
636 sc->jme_flags |= JME_FLAG_FPGA;

--- 2473 unchanged lines hidden ---