summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2008-06-11 20:22:00 +0000
committerjsg <jsg@openbsd.org>2008-06-11 20:22:00 +0000
commitf65c38eb2c244286756bbf85628f44342c37da29 (patch)
treed1a58730632a37077815f25298a87c96573c2283
parentWhen reading a GPIO pin, first determine if it is programmed for input (diff)
downloadwireguard-openbsd-f65c38eb2c244286756bbf85628f44342c37da29.tar.xz
wireguard-openbsd-f65c38eb2c244286756bbf85628f44342c37da29.zip
Add a bunch of new ciss devices from Scott Benesh at HP via FreeBSD.
ok dlg@
-rw-r--r--share/man/man4/ciss.47
-rw-r--r--sys/dev/pci/ciss_pci.c7
-rw-r--r--sys/dev/pci/pcidevs7
3 files changed, 16 insertions, 5 deletions
diff --git a/share/man/man4/ciss.4 b/share/man/man4/ciss.4
index f80fe00be9a..20f173e774c 100644
--- a/share/man/man4/ciss.4
+++ b/share/man/man4/ciss.4
@@ -1,8 +1,8 @@
-.\" $OpenBSD: ciss.4,v 1.9 2007/05/31 19:19:49 jmc Exp $
+.\" $OpenBSD: ciss.4,v 1.10 2008/06/11 20:24:46 jsg Exp $
.\"
.\" Michael Shalayeff, 2005. Public Domain.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: June 11 2008 $
.Dt CISS 4
.Os
.Sh NAME
@@ -23,7 +23,8 @@ Compaq 532, 5300, 5312, 5i
.It
Compaq 641, 642, 6400, 6400EM, 6422
.It
-Hewlett-Packard 6i, E200, E200i, E500, P400, P400i, P600, P800, V100
+Hewlett-Packard 6i, E200, E200i, E500, P212, P400, P400i, P410, P410i,
+P411, P600, P800, P812, V100
.El
.Pp
These controllers support RAID 0, RAID 1, RAID 5, JBOD,
diff --git a/sys/dev/pci/ciss_pci.c b/sys/dev/pci/ciss_pci.c
index 276e466e366..fa2ebdcfe0b 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.11 2008/05/23 08:49:27 brad Exp $ */
+/* $OpenBSD: ciss_pci.c,v 1.12 2008/06/11 20:24:47 jsg Exp $ */
/*
* Copyright (c) 2005 Michael Shalayeff
@@ -63,8 +63,13 @@ const struct pci_matchid ciss_pci_devices[] = {
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200I_2 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE200I_3 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAE500 },
+ { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP212 },
+ { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP410 },
+ { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP410I },
+ { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP411 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP600 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP800 },
+ { PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAP812 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSAV100 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_1 },
{ PCI_VENDOR_HP, PCI_PRODUCT_HP_HPSA_2 },
diff --git a/sys/dev/pci/pcidevs b/sys/dev/pci/pcidevs
index d428733fc7b..ea9248d0633 100644
--- a/sys/dev/pci/pcidevs
+++ b/sys/dev/pci/pcidevs
@@ -1,4 +1,4 @@
-$OpenBSD: pcidevs,v 1.1380 2008/06/11 19:43:50 jsg Exp $
+$OpenBSD: pcidevs,v 1.1381 2008/06/11 20:22:00 jsg Exp $
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
/*
@@ -1766,6 +1766,11 @@ product HP HPSA_9 0x3239 Smart Array
product HP HPSA_10 0x323a Smart Array
product HP HPSA_11 0x323b Smart Array
product HP HPSA_12 0x323c Smart Array
+product HP HPSAP212 0x3241 Smart Array P212
+product HP HPSAP410 0x3243 Smart Array P410
+product HP HPSAP410I 0x3245 Smart Array P410i
+product HP HPSAP411 0x3247 Smart Array P411
+product HP HPSAP812 0x3249 Smart Array P812
product HP USB 0x3300 USB
product HP IPMI 0x3302 IPMI