diff options
| author | Brad Smith <brad@cvs.openbsd.org> | 2005-12-13 15:56:02 +0000 |
|---|---|---|
| committer | Brad Smith <brad@cvs.openbsd.org> | 2005-12-13 15:56:02 +0000 |
| commit | 8e751e82340662a34e4ded0556545dc6c66cf284 (patch) | |
| tree | 079ee63e4708c741040ec048cbd8b65723830ce7 /sys | |
| parent | 36f76e8c7254dfc80aa90121e5f77e207e91c4eb (diff) | |
- Add a whole bunch of new PCI ids.
- Remove the version ("valance") check as it is not necessary.
From FreeBSD
ok mickey@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ciss.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/cissreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/pci/ciss_pci.c | 22 |
3 files changed, 21 insertions, 13 deletions
diff --git a/sys/dev/ic/ciss.c b/sys/dev/ic/ciss.c index 55ff13e44f3..5823e4c59d2 100644 --- a/sys/dev/ic/ciss.c +++ b/sys/dev/ic/ciss.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss.c,v 1.11 2005/12/12 11:31:54 mickey Exp $ */ +/* $OpenBSD: ciss.c,v 1.12 2005/12/13 15:55:58 brad Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -144,12 +144,6 @@ ciss_attach(struct ciss_softc *sc) return -1; } - if (sc->cfg.version != CISS_VERSION && - sc->cfg.version != CISS_VERSION3) { - printf(": unsupported version 0x%08x\n", sc->cfg.version); - return -1; - } - if (!(sc->cfg.methods & CISS_METH_SIMPL)) { printf(": not simple 0x%08x\n", sc->cfg.methods); return -1; diff --git a/sys/dev/ic/cissreg.h b/sys/dev/ic/cissreg.h index 6f19eed4516..26d06ce831b 100644 --- a/sys/dev/ic/cissreg.h +++ b/sys/dev/ic/cissreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cissreg.h,v 1.3 2005/11/23 14:46:47 mickey Exp $ */ +/* $OpenBSD: cissreg.h,v 1.4 2005/12/13 15:55:59 brad Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -51,8 +51,6 @@ struct ciss_config { u_int32_t signature; #define CISS_SIGNATURE (*(u_int32_t *)"CISS") u_int32_t version; -#define CISS_VERSION 1 -#define CISS_VERSION3 3 u_int32_t methods; #define CISS_METH_READY 0x0001 #define CISS_METH_SIMPL 0x0002 diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c index 38ed39bb011..f900808bca2 100644 --- a/sys/dev/pci/ciss_pci.c +++ b/sys/dev/pci/ciss_pci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ciss_pci.c,v 1.8 2005/12/11 23:50:59 brad Exp $ */ +/* $OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -51,17 +51,33 @@ const struct pci_matchid ciss_pci_devices[] = { { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5312 }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5i }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA5i_2 }, + { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6i }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA641 }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA642 }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6400 }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6400EM }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA6422 }, { PCI_VENDOR_COMPAQ, PCI_PRODUCT_COMPAQ_CSA64XX }, - { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAV100 }, - { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP800 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200I_1 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200I_2 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200I_3 }, { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP600 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP800 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAV100 }, { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_1 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_2 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_3 }, { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_4 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_5 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_6 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_7 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_8 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_9 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_10 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_11 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_12 }, + { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_13 }, }; #define CISS_PCI_NDEVS sizeof(ciss_pci_devices)/sizeof(ciss_pci_devices[0]) |