Sun Sep 23 01:10:10 2012 UTC ()
add an entry for subclass HD audio.


(chs)
diff -r1.92 -r1.93 src/sys/dev/pci/pci_subr.c
cvs diff -r1.92 -r1.93 src/sys/dev/pci/pci_subr.c (expand / switch to unified diff)

--- src/sys/dev/pci/pci_subr.c 2012/04/24 09:53:41 1.92
+++ src/sys/dev/pci/pci_subr.c 2012/09/23 01:10:10 1.93
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: pci_subr.c,v 1.92 2012/04/24 09:53:41 drochner Exp $ */ 1/* $NetBSD: pci_subr.c,v 1.93 2012/09/23 01:10:10 chs Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997 Zubin D. Dittia. All rights reserved. 4 * Copyright (c) 1997 Zubin D. Dittia. All rights reserved.
5 * Copyright (c) 1995, 1996, 1998, 2000 5 * Copyright (c) 1995, 1996, 1998, 2000
6 * Christopher G. Demetriou. All rights reserved. 6 * Christopher G. Demetriou. All rights reserved.
7 * Copyright (c) 1994 Charles M. Hannum. All rights reserved. 7 * Copyright (c) 1994 Charles M. Hannum. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 30 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 31 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 32 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
33 */ 33 */
34 34
35/* 35/*
36 * PCI autoconfiguration support functions. 36 * PCI autoconfiguration support functions.
37 * 37 *
38 * Note: This file is also built into a userland library (libpci). 38 * Note: This file is also built into a userland library (libpci).
39 * Pay attention to this when you make modifications. 39 * Pay attention to this when you make modifications.
40 */ 40 */
41 41
42#include <sys/cdefs.h> 42#include <sys/cdefs.h>
43__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.92 2012/04/24 09:53:41 drochner Exp $"); 43__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.93 2012/09/23 01:10:10 chs Exp $");
44 44
45#ifdef _KERNEL_OPT 45#ifdef _KERNEL_OPT
46#include "opt_pci.h" 46#include "opt_pci.h"
47#endif 47#endif
48 48
49#include <sys/param.h> 49#include <sys/param.h>
50 50
51#ifdef _KERNEL 51#ifdef _KERNEL
52#include <sys/systm.h> 52#include <sys/systm.h>
53#include <sys/intr.h> 53#include <sys/intr.h>
54#include <sys/module.h> 54#include <sys/module.h>
55#else 55#else
56#include <pci.h> 56#include <pci.h>
@@ -108,26 +108,27 @@ static const struct pci_class pci_subcla @@ -108,26 +108,27 @@ static const struct pci_class pci_subcla
108 108
109static const struct pci_class pci_subclass_display[] = { 109static const struct pci_class pci_subclass_display[] = {
110 { "VGA", PCI_SUBCLASS_DISPLAY_VGA, NULL, }, 110 { "VGA", PCI_SUBCLASS_DISPLAY_VGA, NULL, },
111 { "XGA", PCI_SUBCLASS_DISPLAY_XGA, NULL, }, 111 { "XGA", PCI_SUBCLASS_DISPLAY_XGA, NULL, },
112 { "3D", PCI_SUBCLASS_DISPLAY_3D, NULL, }, 112 { "3D", PCI_SUBCLASS_DISPLAY_3D, NULL, },
113 { "miscellaneous", PCI_SUBCLASS_DISPLAY_MISC, NULL, }, 113 { "miscellaneous", PCI_SUBCLASS_DISPLAY_MISC, NULL, },
114 { NULL, 0, NULL, }, 114 { NULL, 0, NULL, },
115}; 115};
116 116
117static const struct pci_class pci_subclass_multimedia[] = { 117static const struct pci_class pci_subclass_multimedia[] = {
118 { "video", PCI_SUBCLASS_MULTIMEDIA_VIDEO, NULL, }, 118 { "video", PCI_SUBCLASS_MULTIMEDIA_VIDEO, NULL, },
119 { "audio", PCI_SUBCLASS_MULTIMEDIA_AUDIO, NULL, }, 119 { "audio", PCI_SUBCLASS_MULTIMEDIA_AUDIO, NULL, },
120 { "telephony", PCI_SUBCLASS_MULTIMEDIA_TELEPHONY, NULL,}, 120 { "telephony", PCI_SUBCLASS_MULTIMEDIA_TELEPHONY, NULL,},
 121 { "HD audio", PCI_SUBCLASS_MULTIMEDIA_HDAUDIO, NULL, },
121 { "miscellaneous", PCI_SUBCLASS_MULTIMEDIA_MISC, NULL, }, 122 { "miscellaneous", PCI_SUBCLASS_MULTIMEDIA_MISC, NULL, },
122 { NULL, 0, NULL, }, 123 { NULL, 0, NULL, },
123}; 124};
124 125
125static const struct pci_class pci_subclass_memory[] = { 126static const struct pci_class pci_subclass_memory[] = {
126 { "RAM", PCI_SUBCLASS_MEMORY_RAM, NULL, }, 127 { "RAM", PCI_SUBCLASS_MEMORY_RAM, NULL, },
127 { "flash", PCI_SUBCLASS_MEMORY_FLASH, NULL, }, 128 { "flash", PCI_SUBCLASS_MEMORY_FLASH, NULL, },
128 { "miscellaneous", PCI_SUBCLASS_MEMORY_MISC, NULL, }, 129 { "miscellaneous", PCI_SUBCLASS_MEMORY_MISC, NULL, },
129 { NULL, 0, NULL, }, 130 { NULL, 0, NULL, },
130}; 131};
131 132
132static const struct pci_class pci_subclass_bridge[] = { 133static const struct pci_class pci_subclass_bridge[] = {
133 { "host", PCI_SUBCLASS_BRIDGE_HOST, NULL, }, 134 { "host", PCI_SUBCLASS_BRIDGE_HOST, NULL, },