Deleted Added
full compact
aac_pci.c (152144) aac_pci.c (159702)
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2001 Scott Long
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 Adaptec, Inc.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2000 Michael Smith
3 * Copyright (c) 2001 Scott Long
4 * Copyright (c) 2000 BSDi
5 * Copyright (c) 2001 Adaptec, Inc.
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

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

23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
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#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: head/sys/dev/aac/aac_pci.c 152144 2005-11-06 22:52:52Z scottl $");
31__FBSDID("$FreeBSD: head/sys/dev/aac/aac_pci.c 159702 2006-06-17 18:42:26Z brueffer $");
32
33/*
34 * PCI bus interface and resource allocation.
35 */
36
37#include "opt_aac.h"
38
39#include <sys/param.h>

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

121 "HP NetRaid-4M"},
122 {0x9005, 0x0285, 0x9005, 0x0285, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
123 AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2200S"},
124 {0x9005, 0x0285, 0x1028, 0x0287, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
125 AAC_FLAGS_256FIBS, "Dell PERC 320/DC"},
126 {0x9005, 0x0285, 0x9005, 0x0286, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
127 AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"},
128 {0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
32
33/*
34 * PCI bus interface and resource allocation.
35 */
36
37#include "opt_aac.h"
38
39#include <sys/param.h>

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

121 "HP NetRaid-4M"},
122 {0x9005, 0x0285, 0x9005, 0x0285, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
123 AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2200S"},
124 {0x9005, 0x0285, 0x1028, 0x0287, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
125 AAC_FLAGS_256FIBS, "Dell PERC 320/DC"},
126 {0x9005, 0x0285, 0x9005, 0x0286, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
127 AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"},
128 {0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
129 "Adaptec SCSI RAID 2410SA"},
129 "Adaptec SATA RAID 2410SA"},
130 {0x9005, 0x0285, 0x1028, 0x0291, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
131 "Dell CERC SATA RAID 2"},
132 {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
130 {0x9005, 0x0285, 0x1028, 0x0291, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
131 "Dell CERC SATA RAID 2"},
132 {0x9005, 0x0285, 0x9005, 0x0292, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
133 "Adaptec SCSI RAID 2810SA"},
133 "Adaptec SATA RAID 2810SA"},
134 {0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
134 {0x9005, 0x0285, 0x9005, 0x0293, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
135 "Adaptec SCSI RAID 21610SA"},
135 "Adaptec SATA RAID 21610SA"},
136 {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
137 "HP ML110 G2 (Adaptec 2610SA)"},
138 {0x9005, 0x0286, 0x9005, 0x028c, AAC_HWIF_RKT, 0,
139 "Adaptec SCSI RAID 2230S"},
140 {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0,
141 "Adaptec SCSI RAID 2130S"},
142
143 {0x9005, 0x0285, 0x9005, 0x0287, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |

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

156 "Adaptec SCSI RAID 2025ZCR"},
157 {0x9005, 0x0286, 0x9005, 0x029b, AAC_HWIF_RKT, 0,
158 "Adaptec SATA RAID 2820SA"},
159 {0x9005, 0x0286, 0x9005, 0x029c, AAC_HWIF_RKT, 0,
160 "Adaptec SATA RAID 2620SA"},
161 {0x9005, 0x0286, 0x9005, 0x029d, AAC_HWIF_RKT, 0,
162 "Adaptec SATA RAID 2420SA"},
163 {0x9005, 0x0286, 0x9005, 0x029e, AAC_HWIF_RKT, 0,
136 {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
137 "HP ML110 G2 (Adaptec 2610SA)"},
138 {0x9005, 0x0286, 0x9005, 0x028c, AAC_HWIF_RKT, 0,
139 "Adaptec SCSI RAID 2230S"},
140 {0x9005, 0x0286, 0x9005, 0x028d, AAC_HWIF_RKT, 0,
141 "Adaptec SCSI RAID 2130S"},
142
143 {0x9005, 0x0285, 0x9005, 0x0287, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |

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

156 "Adaptec SCSI RAID 2025ZCR"},
157 {0x9005, 0x0286, 0x9005, 0x029b, AAC_HWIF_RKT, 0,
158 "Adaptec SATA RAID 2820SA"},
159 {0x9005, 0x0286, 0x9005, 0x029c, AAC_HWIF_RKT, 0,
160 "Adaptec SATA RAID 2620SA"},
161 {0x9005, 0x0286, 0x9005, 0x029d, AAC_HWIF_RKT, 0,
162 "Adaptec SATA RAID 2420SA"},
163 {0x9005, 0x0286, 0x9005, 0x029e, AAC_HWIF_RKT, 0,
164 "ICP9024RO SATA RAID"},
164 "ICP ICP9024RO SCSI RAID"},
165 {0x9005, 0x0286, 0x9005, 0x029f, AAC_HWIF_RKT, 0,
165 {0x9005, 0x0286, 0x9005, 0x029f, AAC_HWIF_RKT, 0,
166 "ICP9014RO SATA RAID"},
166 "ICP ICP9014RO SCSI RAID"},
167 {0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0,
168 "Adaptec SATA RAID 2026ZCR"},
169 {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0,
170 "Adaptec SATA RAID 2610SA"},
171 {0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0,
172 "Adaptec SCSI RAID 2240S"},
173 {0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0,
174 "Adaptec SAS RAID 4005SAS"},

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

180 "Adaptec SAS RAID 4800SAS"},
181 {0x9005, 0x0285, 0x9005, 0x029a, AAC_HWIF_I960RX, 0,
182 "Adaptec SAS RAID 4805SAS"},
183 {0x9005, 0x0285, 0x9005, 0x028e, AAC_HWIF_I960RX, 0,
184 "Adaptec SATA RAID 2020SA ZCR"},
185 {0x9005, 0x0285, 0x9005, 0x028f, AAC_HWIF_I960RX, 0,
186 "Adaptec SATA RAID 2025SA ZCR"},
187 {0x9005, 0x0285, 0x9005, 0x02a4, AAC_HWIF_I960RX, 0,
167 {0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0,
168 "Adaptec SATA RAID 2026ZCR"},
169 {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0,
170 "Adaptec SATA RAID 2610SA"},
171 {0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0,
172 "Adaptec SCSI RAID 2240S"},
173 {0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0,
174 "Adaptec SAS RAID 4005SAS"},

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

180 "Adaptec SAS RAID 4800SAS"},
181 {0x9005, 0x0285, 0x9005, 0x029a, AAC_HWIF_I960RX, 0,
182 "Adaptec SAS RAID 4805SAS"},
183 {0x9005, 0x0285, 0x9005, 0x028e, AAC_HWIF_I960RX, 0,
184 "Adaptec SATA RAID 2020SA ZCR"},
185 {0x9005, 0x0285, 0x9005, 0x028f, AAC_HWIF_I960RX, 0,
186 "Adaptec SATA RAID 2025SA ZCR"},
187 {0x9005, 0x0285, 0x9005, 0x02a4, AAC_HWIF_I960RX, 0,
188 "ICP 9085LI SAS RAID"},
188 "ICP ICP9085LI SAS RAID"},
189 {0x9005, 0x0285, 0x9005, 0x02a5, AAC_HWIF_I960RX, 0,
189 {0x9005, 0x0285, 0x9005, 0x02a5, AAC_HWIF_I960RX, 0,
190 "ICP 5085BR SAS RAID"},
190 "ICP ICP5085BR SAS RAID"},
191 {0x9005, 0x0286, 0x9005, 0x02a0, AAC_HWIF_RKT, 0,
191 {0x9005, 0x0286, 0x9005, 0x02a0, AAC_HWIF_RKT, 0,
192 "ICP9047MA SATA RAID"},
192 "ICP ICP9047MA SATA RAID"},
193 {0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
193 {0x9005, 0x0286, 0x9005, 0x02a1, AAC_HWIF_RKT, 0,
194 "ICP9087MA SATA RAID"},
194 "ICP ICP9087MA SATA RAID"},
195 {0, 0, 0, 0, 0, 0, 0}
196};
197
198static struct aac_ident *
199aac_find_ident(device_t dev)
200{
201 struct aac_ident *m;
202

--- 210 unchanged lines hidden ---
195 {0, 0, 0, 0, 0, 0, 0}
196};
197
198static struct aac_ident *
199aac_find_ident(device_t dev)
200{
201 struct aac_ident *m;
202

--- 210 unchanged lines hidden ---