diff options
| author | Scott Long <scottl@FreeBSD.org> | 2005-01-23 23:25:41 +0000 |
|---|---|---|
| committer | Scott Long <scottl@FreeBSD.org> | 2005-01-23 23:25:41 +0000 |
| commit | 35e050281e55d71fbb0e061714b905c8b0166b2a (patch) | |
| tree | e248aac00cf66cce7f47f7da92d7af76b3f8fb2d /sys/dev/amr/amr_pci.c | |
| parent | a56d2b5a51019345addc9748ba340e9b95d2a2a0 (diff) | |
| download | src-35e050281e55d71fbb0e061714b905c8b0166b2a.tar.gz src-35e050281e55d71fbb0e061714b905c8b0166b2a.zip | |
Add support for the LSI 320-2E PCI-Express controller. Fix a couple of bugs
in the ioctl handler. Update the LSI copyrights for these.
Obtained from: LSI, Corp
Notes
Notes:
svn path=/head/; revision=140688
Diffstat (limited to 'sys/dev/amr/amr_pci.c')
| -rw-r--r-- | sys/dev/amr/amr_pci.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/amr/amr_pci.c b/sys/dev/amr/amr_pci.c index d408eefe3c2d..c70159babfd7 100644 --- a/sys/dev/amr/amr_pci.c +++ b/sys/dev/amr/amr_pci.c @@ -26,7 +26,7 @@ */ /*- * Copyright (c) 2002 Eric Moore - * Copyright (c) 2002 LSI Logic Corporation + * Copyright (c) 2002, 2004 LSI Logic Corporation * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -128,6 +128,8 @@ static struct {0x101e, 0x1960, 0}, {0x1000, 0x1960, PROBE_SIGNATURE}, {0x1000, 0x0407, 0}, + {0x1000, 0x0408, 0}, + {0x1000, 0x0409, 0}, {0x1028, 0x000e, PROBE_SIGNATURE}, /* perc4/di i960 */ {0x1028, 0x000f, 0}, /* perc4/di Verde*/ {0x1028, 0x0013, 0}, /* perc4/di */ @@ -151,7 +153,7 @@ amr_pci_probe(device_t dev) if ((sig != AMR_SIGNATURE_1) && (sig != AMR_SIGNATURE_2)) continue; } - device_set_desc(dev, "LSILogic MegaRAID"); + device_set_desc(dev, LSI_DESC_PCI); return(-10); /* allow room to be overridden */ } } @@ -183,6 +185,7 @@ amr_pci_attach(device_t dev) */ command = pci_read_config(dev, PCIR_COMMAND, 1); if ((pci_get_device(dev) == 0x1960) || (pci_get_device(dev) == 0x0407) || + (pci_get_device(dev) == 0x0408) || (pci_get_device(dev) == 0x0409) || (pci_get_device(dev) == 0x000e) || (pci_get_device(dev) == 0x000f) || (pci_get_device(dev) == 0x0013)) { /* |