Deleted Added
full compact
if_sf.c (139825) if_sf.c (142398)
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/dev/sf/if_sf.c 139825 2005-01-07 02:29:27Z imp $");
34__FBSDID("$FreeBSD: head/sys/dev/sf/if_sf.c 142398 2005-02-24 21:32:56Z imp $");
35
36/*
37 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
38 * Programming manual is available from:
39 * http://download.adaptec.com/pdfs/user_guides/aic6915_pg.pdf.
40 *
41 * Written by Bill Paul <wpaul@ctr.columbia.edu>
42 * Department of Electical Engineering

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

598 if ((pci_get_vendor(dev) == t->sf_vid) &&
599 (pci_get_device(dev) == t->sf_did)) {
600 switch((pci_read_config(dev,
601 SF_PCI_SUBVEN_ID, 4) >> 16) & 0xFFFF) {
602 case AD_SUBSYSID_62011_REV0:
603 case AD_SUBSYSID_62011_REV1:
604 device_set_desc(dev,
605 "Adaptec ANA-62011 10/100BaseTX");
35
36/*
37 * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD.
38 * Programming manual is available from:
39 * http://download.adaptec.com/pdfs/user_guides/aic6915_pg.pdf.
40 *
41 * Written by Bill Paul <wpaul@ctr.columbia.edu>
42 * Department of Electical Engineering

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

598 if ((pci_get_vendor(dev) == t->sf_vid) &&
599 (pci_get_device(dev) == t->sf_did)) {
600 switch((pci_read_config(dev,
601 SF_PCI_SUBVEN_ID, 4) >> 16) & 0xFFFF) {
602 case AD_SUBSYSID_62011_REV0:
603 case AD_SUBSYSID_62011_REV1:
604 device_set_desc(dev,
605 "Adaptec ANA-62011 10/100BaseTX");
606 return(0);
606 return (BUS_PROBE_DEFAULT);
607 case AD_SUBSYSID_62022:
608 device_set_desc(dev,
609 "Adaptec ANA-62022 10/100BaseTX");
607 case AD_SUBSYSID_62022:
608 device_set_desc(dev,
609 "Adaptec ANA-62022 10/100BaseTX");
610 return(0);
610 return (BUS_PROBE_DEFAULT);
611 case AD_SUBSYSID_62044_REV0:
612 case AD_SUBSYSID_62044_REV1:
613 device_set_desc(dev,
614 "Adaptec ANA-62044 10/100BaseTX");
611 case AD_SUBSYSID_62044_REV0:
612 case AD_SUBSYSID_62044_REV1:
613 device_set_desc(dev,
614 "Adaptec ANA-62044 10/100BaseTX");
615 return(0);
615 return (BUS_PROBE_DEFAULT);
616 case AD_SUBSYSID_62020:
617 device_set_desc(dev,
618 "Adaptec ANA-62020 10/100BaseFX");
616 case AD_SUBSYSID_62020:
617 device_set_desc(dev,
618 "Adaptec ANA-62020 10/100BaseFX");
619 return(0);
619 return (BUS_PROBE_DEFAULT);
620 case AD_SUBSYSID_69011:
621 device_set_desc(dev,
622 "Adaptec ANA-69011 10/100BaseTX");
620 case AD_SUBSYSID_69011:
621 device_set_desc(dev,
622 "Adaptec ANA-69011 10/100BaseTX");
623 return(0);
623 return (BUS_PROBE_DEFAULT);
624 default:
625 device_set_desc(dev, t->sf_name);
624 default:
625 device_set_desc(dev, t->sf_name);
626 return(0);
626 return (BUS_PROBE_DEFAULT);
627 break;
628 }
629 }
630 t++;
631 }
632
633 return(ENXIO);
634}

--- 928 unchanged lines hidden ---
627 break;
628 }
629 }
630 t++;
631 }
632
633 return(ENXIO);
634}

--- 928 unchanged lines hidden ---