summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-05-11 23:34:36 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-05-11 23:34:36 +0000
commitc80038e3a4475fb7cb5184ba7982376ebfb62a0b (patch)
tree240099e19a173606c16c0a3943bd10ef7901ba49 /sys
parent2c3b887610852eecfd347f84dcc6e0e3fb0416f8 (diff)
use the PCI multimedia subclass type HD audio define from pcireg.h
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/pci/azalia.c4
-rw-r--r--sys/dev/pci/azalia.h5
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 1ef7b97d9ee..5163fdc9f8e 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.c,v 1.7 2006/05/08 20:36:59 brad Exp $ */
+/* $OpenBSD: azalia.c,v 1.8 2006/05/11 23:34:35 brad Exp $ */
/* $NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $ */
/*-
@@ -355,7 +355,7 @@ azalia_pci_match(struct device *parent, void *match, void *aux)
pa = aux;
if (PCI_CLASS(pa->pa_class) == PCI_CLASS_MULTIMEDIA
- && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_HDAUDIO)
+ && PCI_SUBCLASS(pa->pa_class) == PCI_SUBCLASS_MULTIMEDIA_HDAUDIO)
return 1;
return 0;
}
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h
index 5da80b4f3db..9e601926a77 100644
--- a/sys/dev/pci/azalia.h
+++ b/sys/dev/pci/azalia.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.h,v 1.5 2006/05/08 04:18:43 brad Exp $ */
+/* $OpenBSD: azalia.h,v 1.6 2006/05/11 23:34:35 brad Exp $ */
/* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */
/*-
@@ -425,9 +425,6 @@
#define CORB_NID_ROOT 0
#define HDA_MAX_CHANNELS 16
-
-#define PCI_SUBCLASS_HDAUDIO 0x03
-
/* memory-mapped types */
typedef struct {
uint32_t low;