diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-11-15 20:32:05 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-11-15 20:32:05 +0000 |
| commit | 880fecd259a41680eebad50242d766497acd070d (patch) | |
| tree | 614799f6a686e3d005122a01d4ada3771f05ada3 /sys | |
| parent | a237d262c9a2ae25043e95b5501fad9aef2793b6 (diff) | |
more accurately reflect the naming scheme of the Marvell Yukon devices with there
pcidevs entries.
Based on information from the Marvell Yukon/Yukon-II FreeBSD driver.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/if_sk.c | 26 | ||||
| -rw-r--r-- | sys/dev/pci/pcidevs | 30 |
2 files changed, 28 insertions, 28 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c index 0a3d95a6ca5..cd42a26d5f2 100644 --- a/sys/dev/pci/if_sk.c +++ b/sys/dev/pci/if_sk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_sk.c,v 1.86 2005/11/07 02:57:45 brad Exp $ */ +/* $OpenBSD: if_sk.c,v 1.87 2005/11/15 20:32:04 brad Exp $ */ /* * Copyright (c) 1997, 1998, 1999, 2000 @@ -218,25 +218,25 @@ const struct pci_matchid skc_devices[] = { { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T }, { PCI_VENDOR_DLINK, PCI_PRODUCT_DLINK_DGE560T_2 }, { PCI_VENDOR_LINKSYS, PCI_PRODUCT_LINKSYS_EG1064 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_SK_V2_BELKIN }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_1 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_BELKIN }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_2 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_3 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_4 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_5 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_6 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_7 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_9 }, - { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_10 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8035 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8036 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8052 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8050 }, { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKON_8053 }, - { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_GE }, - { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9821v2 }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021CU }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022CU }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8021X }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8022X }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061CU }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062CU }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8061X }, + { PCI_VENDOR_MARVELL, PCI_PRODUCT_MARVELL_YUKONII_8062X }, + { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX }, + { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK98XX2 }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Sxx }, { PCI_VENDOR_SCHNEIDERKOCH, PCI_PRODUCT_SCHNEIDERKOCH_SK9Exx }, }; diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs index 995ecdec0ca..2c540052ebe 100644 --- a/sys/dev/pci/pcidevs +++ b/sys/dev/pci/pcidevs @@ -1,4 +1,4 @@ -$OpenBSD: pcidevs,v 1.959 2005/11/14 15:08:49 jsg Exp $ +$OpenBSD: pcidevs,v 1.960 2005/11/15 20:32:03 brad Exp $ /* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */ /* @@ -1916,23 +1916,23 @@ product MARVELL 88W8310 0x1fa7 Libertas 88W8310 product MARVELL 88W8335_1 0x1faa Libertas 88W8335 product MARVELL 88W8335_2 0x1fab Libertas 88W8335 product MARVELL 88W8300_2 0x2a01 Libertas 88W8300 -product MARVELL SK_V2 0x4320 SKv2 -product MARVELL YUKON_1 0x4340 Yukon -product MARVELL YUKON_2 0x4341 Yukon -product MARVELL YUKON_3 0x4342 Yukon -product MARVELL YUKON_4 0x4343 Yukon -product MARVELL YUKON_5 0x4344 Yukon -product MARVELL YUKON_6 0x4345 Yukon -product MARVELL YUKON_7 0x4346 Yukon -product MARVELL YUKON_8 0x4347 Yukon +product MARVELL YUKON 0x4320 Yukon 88E8001/8003/8010 +product MARVELL YUKONII_8021CU 0x4340 Yukon-II 8021CU +product MARVELL YUKONII_8022CU 0x4341 Yukon-II 8022CU +product MARVELL YUKONII_8061CU 0x4342 Yukon-II 8061CU +product MARVELL YUKONII_8062CU 0x4343 Yukon-II 8062CU +product MARVELL YUKONII_8021X 0x4344 Yukon-II 8021X +product MARVELL YUKONII_8022X 0x4345 Yukon-II 8022X +product MARVELL YUKONII_8061X 0x4346 Yukon-II 8061X +product MARVELL YUKONII_8062X 0x4347 Yukon-II 8062X product MARVELL YUKON_8035 0x4350 Yukon 8035 product MARVELL YUKON_8036 0x4351 Yukon 8036 -product MARVELL YUKON_9 0x4352 Yukon +product MARVELL YUKON_2 0x4352 Yukon product MARVELL YUKON_8052 0x4360 Yukon 8052 product MARVELL YUKON_8050 0x4361 Yukon 8050 product MARVELL YUKON_8053 0x4362 Yukon 8053 -product MARVELL YUKON_10 0x4363 Yukon -product MARVELL SK_V2_BELKIN 0x5005 Belkin F5D5005 +product MARVELL YUKON_3 0x4363 Yukon +product MARVELL YUKON_BELKIN 0x5005 Belkin F5D5005 product MARVELL MV88SX5040 0x5040 MV88SX5040 SATA product MARVELL MV88SX5041 0x5041 MV88SX5041 SATA product MARVELL MV88SX5080 0x5080 MV88SX5080 SATA @@ -2595,8 +2595,8 @@ product DIGI NEO4 0x00b0 Neo-4 /* Schneider & Koch (SysKonnect) */ product SCHNEIDERKOCH FDDI 0x4000 FDDI -product SCHNEIDERKOCH GE 0x4300 984x GE -product SCHNEIDERKOCH SK9821v2 0x4320 SK-9821 v2.0 +product SCHNEIDERKOCH SK98XX 0x4300 SK-98xx +product SCHNEIDERKOCH SK98XX2 0x4320 SK-98xx v2.0 product SCHNEIDERKOCH SK9D21 0x4400 SK-9D21 product SCHNEIDERKOCH SK9Sxx 0x9000 SK-9Sxx product SCHNEIDERKOCH SK9Exx 0x9E00 SK-9Exx |