diff options
| author | simokawa <simokawa@FreeBSD.org> | 2003-02-18 10:01:44 +0000 |
|---|---|---|
| committer | simokawa <simokawa@FreeBSD.org> | 2003-02-18 10:01:44 +0000 |
| commit | 9f3122a7199a9c3dde67385fbf01336f991ad6e1 (patch) | |
| tree | 50e9a3def2bb7ac665adc767525e340befee2c62 /sys | |
| parent | c8473ad138b47251d436cc1791b06b11e1fd5401 (diff) | |
| download | FreeBSD-src-9f3122a7199a9c3dde67385fbf01336f991ad6e1.zip FreeBSD-src-9f3122a7199a9c3dde67385fbf01336f991ad6e1.tar.gz | |
Use pci_get_devid().
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/firewire/fwohci_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/firewire/fwohcireg.h | 46 |
2 files changed, 24 insertions, 24 deletions
diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c index e870f85..5f1efbd 100644 --- a/sys/dev/firewire/fwohci_pci.c +++ b/sys/dev/firewire/fwohci_pci.c @@ -65,7 +65,7 @@ fwohci_pci_probe( device_t dev ) #if 1 u_int32_t id; - id = (pci_get_vendor(dev) << 16) | pci_get_device(dev); + id = pci_get_devid(dev); if (id == (FW_VENDORID_NEC | FW_DEVICE_UPD861)) { device_set_desc(dev, "NEC uPD72861"); return 0; diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h index afbee03..58b3422 100644 --- a/sys/dev/firewire/fwohcireg.h +++ b/sys/dev/firewire/fwohcireg.h @@ -35,29 +35,29 @@ */ #define PCI_CBMEM 0x10 -#define FW_VENDORID_NEC (0x1033 << 16) -#define FW_VENDORID_TI (0x104c << 16) -#define FW_VENDORID_SONY (0x104d << 16) -#define FW_VENDORID_VIA (0x1106 << 16) -#define FW_VENDORID_RICOH (0x1180 << 16) -#define FW_VENDORID_APPLE (0x106b << 16) -#define FW_VENDORID_LUCENT (0x11c1 << 16) - -#define FW_DEVICE_UPD861 0x0063 -#define FW_DEVICE_UPD871 0x00ce -#define FW_DEVICE_TITSB22 0x8009 -#define FW_DEVICE_TITSB23 0x8019 -#define FW_DEVICE_TITSB26 0x8020 -#define FW_DEVICE_TITSB43 0x8021 -#define FW_DEVICE_TITSB43A 0x8023 -#define FW_DEVICE_TIPCI4450 0x8011 -#define FW_DEVICE_TIPCI4410A 0x8017 -#define FW_DEVICE_CX3022 0x8039 -#define FW_DEVICE_VT6306 0x3044 -#define FW_DEVICE_R5C552 0x0552 -#define FW_DEVICE_PANGEA 0x0030 -#define FW_DEVICE_UNINORTH 0x0031 -#define FW_DEVICE_FW322 0x5811 +#define FW_VENDORID_NEC 0x1033 +#define FW_VENDORID_TI 0x104c +#define FW_VENDORID_SONY 0x104d +#define FW_VENDORID_VIA 0x1106 +#define FW_VENDORID_RICOH 0x1180 +#define FW_VENDORID_APPLE 0x106b +#define FW_VENDORID_LUCENT 0x11c1 + +#define FW_DEVICE_UPD861 (0x0063 << 16) +#define FW_DEVICE_UPD871 (0x00ce << 16) +#define FW_DEVICE_TITSB22 (0x8009 << 16) +#define FW_DEVICE_TITSB23 (0x8019 << 16) +#define FW_DEVICE_TITSB26 (0x8020 << 16) +#define FW_DEVICE_TITSB43 (0x8021 << 16) +#define FW_DEVICE_TITSB43A (0x8023 << 16) +#define FW_DEVICE_TIPCI4450 (0x8011 << 16) +#define FW_DEVICE_TIPCI4410A (0x8017 << 16) +#define FW_DEVICE_CX3022 (0x8039 << 16) +#define FW_DEVICE_VT6306 (0x3044 << 16) +#define FW_DEVICE_R5C552 (0x0552 << 16) +#define FW_DEVICE_PANGEA (0x0030 << 16) +#define FW_DEVICE_UNINORTH (0x0031 << 16) +#define FW_DEVICE_FW322 (0x5811 << 16) #define PCI_INTERFACE_OHCI 0x10 |
