Deleted Added
full compact
if_sf.c (51583) if_sf.c (51657)
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 *
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

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

24 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
25 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
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 * $FreeBSD: head/sys/dev/sf/if_sf.c 51583 1999-09-23 03:32:57Z wpaul $
32 * $FreeBSD: head/sys/dev/sf/if_sf.c 51657 1999-09-25 17:29:02Z wpaul $
33 */
34
35/*
36 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
37 * Programming manual is available from www.adaptec.com.
38 *
39 * Written by Bill Paul <wpaul@ctr.columbia.edu>
40 * Department of Electical Engineering

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

114#include <pci/pcivar.h>
115
116#define SF_USEIOSPACE
117
118#include <pci/if_sfreg.h>
119
120#ifndef lint
121static const char rcsid[] =
33 */
34
35/*
36 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
37 * Programming manual is available from www.adaptec.com.
38 *
39 * Written by Bill Paul <wpaul@ctr.columbia.edu>
40 * Department of Electical Engineering

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

114#include <pci/pcivar.h>
115
116#define SF_USEIOSPACE
117
118#include <pci/if_sfreg.h>
119
120#ifndef lint
121static const char rcsid[] =
122 "$FreeBSD: head/sys/dev/sf/if_sf.c 51583 1999-09-23 03:32:57Z wpaul $";
122 "$FreeBSD: head/sys/dev/sf/if_sf.c 51657 1999-09-25 17:29:02Z wpaul $";
123#endif
124
125static struct sf_type sf_devs[] = {
126 { AD_VENDORID, AD_DEVICEID_STARFIRE,
127 "Adaptec AIC-6915 10/100BaseTX" },
128 { 0, 0, NULL }
129};
130

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

761 */
762 printf("sf%d: Ethernet address: %6D\n", unit,
763 sc->arpcom.ac_enaddr, ":");
764
765 sc->sf_unit = unit;
766
767 /* Allocate the descriptor queues. */
768 sc->sf_ldata = contigmalloc(sizeof(struct sf_list_data), M_DEVBUF,
123#endif
124
125static struct sf_type sf_devs[] = {
126 { AD_VENDORID, AD_DEVICEID_STARFIRE,
127 "Adaptec AIC-6915 10/100BaseTX" },
128 { 0, 0, NULL }
129};
130

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

761 */
762 printf("sf%d: Ethernet address: %6D\n", unit,
763 sc->arpcom.ac_enaddr, ":");
764
765 sc->sf_unit = unit;
766
767 /* Allocate the descriptor queues. */
768 sc->sf_ldata = contigmalloc(sizeof(struct sf_list_data), M_DEVBUF,
769 M_NOWAIT, 0x100000, 0xffffffff, PAGE_SIZE, 0);
769 M_NOWAIT, 0, 0xffffffff, PAGE_SIZE, 0);
770
771 if (sc->sf_ldata == NULL) {
772 printf("sf%d: no memory for list buffers!\n", unit);
773 bus_teardown_intr(dev, sc->sf_irq, sc->sf_intrhand);
774 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sf_irq);
775 bus_release_resource(dev, SF_RES, SF_RID, sc->sf_res);
776 error = ENXIO;
777 goto fail;

--- 687 unchanged lines hidden ---
770
771 if (sc->sf_ldata == NULL) {
772 printf("sf%d: no memory for list buffers!\n", unit);
773 bus_teardown_intr(dev, sc->sf_irq, sc->sf_intrhand);
774 bus_release_resource(dev, SYS_RES_IRQ, 0, sc->sf_irq);
775 bus_release_resource(dev, SF_RES, SF_RID, sc->sf_res);
776 error = ENXIO;
777 goto fail;

--- 687 unchanged lines hidden ---