Deleted Added
full compact
isp_pci.c (154704) isp_pci.c (154846)
1/*-
2 * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
3 * FreeBSD Version.
4 *
5 * Copyright (c) 1997-2006 by Matthew Jacob
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 */
30
31#include <sys/cdefs.h>
1/*-
2 * PCI specific probe and attach routines for Qlogic ISP SCSI adapters.
3 * FreeBSD Version.
4 *
5 * Copyright (c) 1997-2006 by Matthew Jacob
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 */
30
31#include <sys/cdefs.h>
32__FBSDID("$FreeBSD: head/sys/dev/isp/isp_pci.c 154704 2006-01-23 06:23:37Z mjacob $");
32__FBSDID("$FreeBSD: head/sys/dev/isp/isp_pci.c 154846 2006-01-26 05:04:35Z mjacob $");
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/module.h>
38#include <sys/bus.h>
39#include <sys/stdint.h>
40

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

221#ifndef PCI_PRODUCT_QLOGIC_ISP2312
222#define PCI_PRODUCT_QLOGIC_ISP2312 0x2312
223#endif
224
225#ifndef PCI_PRODUCT_QLOGIC_ISP2322
226#define PCI_PRODUCT_QLOGIC_ISP2322 0x2322
227#endif
228
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/kernel.h>
37#include <sys/module.h>
38#include <sys/bus.h>
39#include <sys/stdint.h>
40

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

221#ifndef PCI_PRODUCT_QLOGIC_ISP2312
222#define PCI_PRODUCT_QLOGIC_ISP2312 0x2312
223#endif
224
225#ifndef PCI_PRODUCT_QLOGIC_ISP2322
226#define PCI_PRODUCT_QLOGIC_ISP2322 0x2322
227#endif
228
229#ifndef PCI_PRODUCT_QLOGIC_ISP2422
230#define PCI_PRODUCT_QLOGIC_ISP2422 0x2422
231#endif
232
229#ifndef PCI_PRODUCT_QLOGIC_ISP6312
230#define PCI_PRODUCT_QLOGIC_ISP6312 0x6312
231#endif
232
233#define PCI_QLOGIC_ISP1020 \
234 ((PCI_PRODUCT_QLOGIC_ISP1020 << 16) | PCI_VENDOR_QLOGIC)
235
236#define PCI_QLOGIC_ISP1080 \

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

343 device_set_desc(dev, "Qlogic ISP 2300 PCI FC-AL Adapter");
344 break;
345 case PCI_QLOGIC_ISP2312:
346 device_set_desc(dev, "Qlogic ISP 2312 PCI FC-AL Adapter");
347 break;
348 case PCI_QLOGIC_ISP2322:
349 device_set_desc(dev, "Qlogic ISP 2322 PCI FC-AL Adapter");
350 break;
233#ifndef PCI_PRODUCT_QLOGIC_ISP6312
234#define PCI_PRODUCT_QLOGIC_ISP6312 0x6312
235#endif
236
237#define PCI_QLOGIC_ISP1020 \
238 ((PCI_PRODUCT_QLOGIC_ISP1020 << 16) | PCI_VENDOR_QLOGIC)
239
240#define PCI_QLOGIC_ISP1080 \

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

347 device_set_desc(dev, "Qlogic ISP 2300 PCI FC-AL Adapter");
348 break;
349 case PCI_QLOGIC_ISP2312:
350 device_set_desc(dev, "Qlogic ISP 2312 PCI FC-AL Adapter");
351 break;
352 case PCI_QLOGIC_ISP2322:
353 device_set_desc(dev, "Qlogic ISP 2322 PCI FC-AL Adapter");
354 break;
355 case PCI_QLOGIC_ISP2422:
356 device_set_desc(dev, "Qlogic ISP 2422 PCI FC-AL Adapter");
357 break;
351 case PCI_QLOGIC_ISP6312:
352 device_set_desc(dev, "Qlogic ISP 6312 PCI FC-AL Adapter");
353 break;
354 default:
355 return (ENXIO);
356 }
357 if (isp_announced == 0 && bootverbose) {
358 printf("Qlogic ISP Driver, FreeBSD Version %d.%d, "

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

548 }
549 if (pci_get_devid(dev) == PCI_QLOGIC_ISP2322) {
550 mdvp = &mdvec_2300;
551 basetype = ISP_HA_FC_2322;
552 psize = sizeof (fcparam);
553 pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =
554 PCI_MBOX_REGS2300_OFF;
555 }
358 case PCI_QLOGIC_ISP6312:
359 device_set_desc(dev, "Qlogic ISP 6312 PCI FC-AL Adapter");
360 break;
361 default:
362 return (ENXIO);
363 }
364 if (isp_announced == 0 && bootverbose) {
365 printf("Qlogic ISP Driver, FreeBSD Version %d.%d, "

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

555 }
556 if (pci_get_devid(dev) == PCI_QLOGIC_ISP2322) {
557 mdvp = &mdvec_2300;
558 basetype = ISP_HA_FC_2322;
559 psize = sizeof (fcparam);
560 pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =
561 PCI_MBOX_REGS2300_OFF;
562 }
563 if (pci_get_devid(dev) == PCI_QLOGIC_ISP2422) {
564 mdvp = &mdvec_2300;
565 basetype = ISP_HA_FC_2422;
566 psize = sizeof (fcparam);
567 pcs->pci_poff[MBOX_BLOCK >> _BLK_REG_SHFT] =
568 PCI_MBOX_REGS2300_OFF;
569 }
556 isp = &pcs->pci_isp;
557 isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT | M_ZERO);
558 if (isp->isp_param == NULL) {
559 device_printf(dev, "cannot allocate parameter data\n");
560 goto bad;
561 }
562 isp->isp_mdvec = mdvp;
563 isp->isp_type = basetype;

--- 1548 unchanged lines hidden ---
570 isp = &pcs->pci_isp;
571 isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT | M_ZERO);
572 if (isp->isp_param == NULL) {
573 device_printf(dev, "cannot allocate parameter data\n");
574 goto bad;
575 }
576 isp->isp_mdvec = mdvp;
577 isp->isp_type = basetype;

--- 1548 unchanged lines hidden ---