mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Add generic support for the recent Adaptec flavors of ServeRAID.

Browse Source
This commit is contained in:
Scott Long 2004-03-19 17:36:47 +00:00
parent 6acebfe40f
commit 33ad16c0f1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=127205
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/ips/ips.h
View File

@ -54,8 +54,10 @@
* IPS CONSTANTS
*/
#define IPS_VENDOR_ID 0x1014
#define IPS_VENDOR_ID_ADAPTEC 0x9005
#define IPS_MORPHEUS_DEVICE_ID 0x01BD
#define IPS_COPPERHEAD_DEVICE_ID 0x002E
#define IPS_MARCO_DEVICE_ID 0x0950
#define IPS_CSL 0xff
#define IPS_POCL 0x30

16
sys/dev/ips/ips_pci.c
View File

@ -45,7 +45,11 @@ static int ips_pci_probe(device_t dev)
(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)) {
device_set_desc(dev, "IBM ServeRAID Adapter");
return (0);
}
} else if ((pci_get_vendor(dev) == IPS_VENDOR_ID_ADAPTEC) &&
(pci_get_device(dev) == IPS_MARCO_DEVICE_ID)) {
device_set_desc(dev, "Adaptec ServeRAID Adapter");
return (0);
}
return(ENXIO);
}
@ -77,6 +81,10 @@ static int ips_pci_attach(device_t dev)
sc->ips_adapter_reinit = ips_copperhead_reinit;
sc->ips_adapter_intr = ips_copperhead_intr;
sc->ips_issue_cmd = ips_issue_copperhead_cmd;
} else if (pci_get_device(dev) == IPS_MARCO_DEVICE_ID){
sc->ips_adapter_reinit = ips_morpheus_reinit;
sc->ips_adapter_intr = ips_morpheus_intr;
sc->ips_issue_cmd = ips_issue_morpheus_cmd;
} else
goto error;
/* make sure busmastering is on */
@ -87,10 +95,10 @@ static int ips_pci_attach(device_t dev)
sc->iores = NULL;
if(command & PCIM_CMD_MEMEN){
PRINTF(10, "trying MEMIO\n");
if(pci_get_device(dev) == IPS_MORPHEUS_DEVICE_ID)
sc->rid = PCIR_BAR(0);
if(pci_get_device(dev) == IPS_COPPERHEAD_DEVICE_ID)
sc->rid = PCIR_BAR(1);
else
sc->rid = PCIR_BAR(1);
sc->rid = PCIR_BAR(0);
sc->iotype = SYS_RES_MEMORY;
sc->iores = bus_alloc_resource_any(dev, sc->iotype,
&sc->rid, RF_ACTIVE);