hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2025-01-11 17:04:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ignore subvendor and subdevice ids for all ai7880 parts. These chips

Browse Source 
only support 'mirroring' the vendor and device ids, so we don't
lose any information.  Certain revisions of the aic7880 will not
perform the mirroring so to match all possiblities would double
the number of table entries.  This change also allows us to match
things like the 2944B which I missed in the original table.
This commit is contained in:
Justin T. Gibbs 1999-05-26 16:59:17 +00:00
parent 24e89aa850
commit 51064aaaf8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=47525
2 changed files with 42 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sys/dev/aic7xxx/ahc_pci.c
View File

@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ahc_pci.c,v 1.13 1999/05/17 21:53:09 gibbs Exp $
* $Id: ahc_pci.c,v 1.14 1999/05/25 20:12:32 gibbs Exp $
*/
#include <pci.h>
@ -217,69 +217,63 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
},
/* aic7880 based controllers */
{
ID_AHA_2940AU_CN,
ID_ALL_MASK,
ID_AHA_2940AU_CN & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940A/CN Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U,
ID_ALL_MASK,
ID_AHA_2940U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_3940U,
ID_ALL_MASK,
ID_AHA_3940U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 3940 Ultra SCSI adapter",
ahc_aha394XU_setup
},
{
ID_AHA_2944U,
ID_ALL_MASK,
ID_AHA_2944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2944 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_3944U,
ID_ALL_MASK,
ID_AHA_3944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 3944 Ultra SCSI adapter",
ahc_aha394XU_setup
},
{
ID_AHA_398XU,
ID_ALL_MASK,
ID_AHA_398XU & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 398X Ultra SCSI RAID adapter",
ahc_aha398XU_setup
},
{
/* XXX Don't know the slot numbers so can't identify channels */
ID_AHA_4944U,
ID_ALL_MASK,
ID_AHA_4944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 4944 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940UB,
ID_ALL_MASK,
"Adaptec 2940B Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2930U,
ID_ALL_MASK,
ID_AHA_2930U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2930 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U_PRO,
ID_ALL_MASK,
ID_AHA_2940U_PRO & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940 Pro Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U_CN,
ID_ALL_MASK,
ID_AHA_2940U_CN & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940/CN Ultra SCSI adapter",
ahc_aic7880_setup
},

48
sys/pci/ahc_pci.c
View File

@ -34,7 +34,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: ahc_pci.c,v 1.13 1999/05/17 21:53:09 gibbs Exp $
* $Id: ahc_pci.c,v 1.14 1999/05/25 20:12:32 gibbs Exp $
*/
#include <pci.h>
@ -217,69 +217,63 @@ struct ahc_pci_identity ahc_pci_ident_table [] =
},
/* aic7880 based controllers */
{
ID_AHA_2940AU_CN,
ID_ALL_MASK,
ID_AHA_2940AU_CN & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940A/CN Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U,
ID_ALL_MASK,
ID_AHA_2940U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_3940U,
ID_ALL_MASK,
ID_AHA_3940U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 3940 Ultra SCSI adapter",
ahc_aha394XU_setup
},
{
ID_AHA_2944U,
ID_ALL_MASK,
ID_AHA_2944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2944 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_3944U,
ID_ALL_MASK,
ID_AHA_3944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 3944 Ultra SCSI adapter",
ahc_aha394XU_setup
},
{
ID_AHA_398XU,
ID_ALL_MASK,
ID_AHA_398XU & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 398X Ultra SCSI RAID adapter",
ahc_aha398XU_setup
},
{
/* XXX Don't know the slot numbers so can't identify channels */
ID_AHA_4944U,
ID_ALL_MASK,
ID_AHA_4944U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 4944 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940UB,
ID_ALL_MASK,
"Adaptec 2940B Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2930U,
ID_ALL_MASK,
ID_AHA_2930U & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2930 Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U_PRO,
ID_ALL_MASK,
ID_AHA_2940U_PRO & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940 Pro Ultra SCSI adapter",
ahc_aic7880_setup
},
{
ID_AHA_2940U_CN,
ID_ALL_MASK,
ID_AHA_2940U_CN & ID_DEV_VENDOR_MASK,
ID_DEV_VENDOR_MASK,
"Adaptec 2940/CN Ultra SCSI adapter",
ahc_aic7880_setup
},