summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-06-01 11:17:32 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-06-01 11:17:32 +0000
commit633038fac5a0318e13aa2e76aed8a6ee1f7a7cb7 (patch)
treea841791fc203cc6999368f90922877b8ef612916
parent02a38f527045496ad5ddf5a3dd5580800eff5f91 (diff)
add 2 subclasses, subclass storage SAS and subclass system SD Host Controller.
From NetBSD
-rw-r--r--sys/dev/pci/pci_subr.c4
-rw-r--r--sys/dev/pci/pcireg.h3
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/pci/pci_subr.c b/sys/dev/pci/pci_subr.c
index 94499f36f7f..ed4412d86ce 100644
--- a/sys/dev/pci/pci_subr.c
+++ b/sys/dev/pci/pci_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_subr.c,v 1.18 2006/05/12 20:24:39 brad Exp $ */
+/* $OpenBSD: pci_subr.c,v 1.19 2006/06/01 11:17:31 brad Exp $ */
/* $NetBSD: pci_subr.c,v 1.19 1996/10/13 01:38:29 christos Exp $ */
/*
@@ -71,6 +71,7 @@ const struct pci_class pci_subclass_mass_storage[] = {
{ "RAID", PCI_SUBCLASS_MASS_STORAGE_RAID, },
{ "ATA", PCI_SUBCLASS_MASS_STORAGE_ATA, },
{ "SATA", PCI_SUBCLASS_MASS_STORAGE_SATA, },
+ { "SAS", PCI_SUBCLASS_MASS_STORAGE_SAS, },
{ "miscellaneous", PCI_SUBCLASS_MASS_STORAGE_MISC, },
{ 0 },
};
@@ -144,6 +145,7 @@ const struct pci_class pci_subclass_system[] = {
{ "8254 timer", PCI_SUBCLASS_SYSTEM_TIMER, },
{ "RTC", PCI_SUBCLASS_SYSTEM_RTC, },
{ "PCI Hot-Plug", PCI_SUBCLASS_SYSTEM_PCIHOTPLUG, },
+ { "SD Host Controller", PCI_SUBCLASS_SYSTEM_SDHC, },
{ "miscellaneous", PCI_SUBCLASS_SYSTEM_MISC, },
{ 0 },
};
diff --git a/sys/dev/pci/pcireg.h b/sys/dev/pci/pcireg.h
index 893cbb7640b..b52fe16d20e 100644
--- a/sys/dev/pci/pcireg.h
+++ b/sys/dev/pci/pcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pcireg.h,v 1.30 2006/05/28 17:21:14 uwe Exp $ */
+/* $OpenBSD: pcireg.h,v 1.31 2006/06/01 11:17:31 brad Exp $ */
/* $NetBSD: pcireg.h,v 1.26 2000/05/10 16:58:42 thorpej Exp $ */
/*
@@ -162,6 +162,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_SUBCLASS_MASS_STORAGE_RAID 0x04
#define PCI_SUBCLASS_MASS_STORAGE_ATA 0x05
#define PCI_SUBCLASS_MASS_STORAGE_SATA 0x06
+#define PCI_SUBCLASS_MASS_STORAGE_SAS 0x07
#define PCI_SUBCLASS_MASS_STORAGE_MISC 0x80
/* 0x02 network subclasses */