5c5,6
< * Copyright (c) 1997, 1998, 1999, 2000, 2001 by Matthew Jacob
---
> * Copyright (c) 1997-2006 by Matthew Jacob
> * All rights reserved.
26a28
> *
30c32
< __FBSDID("$FreeBSD: head/sys/dev/isp/isp_pci.c 153462 2005-12-15 22:12:27Z jhb $");
---
> __FBSDID("$FreeBSD: head/sys/dev/isp/isp_pci.c 154704 2006-01-23 06:23:37Z mjacob $");
222a225,228
> #ifndef PCI_PRODUCT_QLOGIC_ISP2322
> #define PCI_PRODUCT_QLOGIC_ISP2322 0x2322
> #endif
>
256a263,265
> #define PCI_QLOGIC_ISP2322 \
> ((PCI_PRODUCT_QLOGIC_ISP2322 << 16) | PCI_VENDOR_QLOGIC)
>
338a348,350
> case PCI_QLOGIC_ISP2322:
> device_set_desc(dev, "Qlogic ISP 2322 PCI FC-AL Adapter");
> break;
536a549,555
> if (pci_get_devid(dev) == PCI_QLOGIC_ISP2322) {
> mdvp = &mdvec_2300;
> basetype = ISP_HA_FC_2322;
> psize = sizeof (fcparam);
> pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =
> PCI_MBOX_REGS2300_OFF;
> }
553c572,575
< if (isp_get_firmware_p) {
---
> /*
> * Don't even attempt to get firmware for the 2322/2422 (yet)
> */
> if (IS_2322(isp) == 0 && IS_24XX(isp) == 0 && isp_get_firmware_p) {
747c769
< if (IS_2312(isp)) {
---
> if (IS_23XX(isp)) {