summaryrefslogtreecommitdiff
path: root/sys/dev/pci/azalia.h
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2008-11-27 23:30:59 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2008-11-27 23:30:59 +0000
commite7e7b361583995517a997814001f298054ce3d15 (patch)
tree66fc663de9842e00409a7292ebd77cd301eb092b /sys/dev/pci/azalia.h
parent20b132a7baaffcc59f142fe5d85ff02ef2001680 (diff)
widget initialization cleanup:
* configure widgets all in one place * add a flag on the widget_t to let us know if the widget is not connected; shaves a lot of connection checking code * be sure not to add power widgets as connectable sources/sinks * configure unconnected pins as output pins. should help some MacBooks and be benign to other devices. the last change has been tested by several as a separate diff. no real functional changes otherwise. from Alexey Suslikov. thanks!
Diffstat (limited to 'sys/dev/pci/azalia.h')
-rw-r--r--sys/dev/pci/azalia.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h
index 1d00df8e5fc..f31df1d65fa 100644
--- a/sys/dev/pci/azalia.h
+++ b/sys/dev/pci/azalia.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.h,v 1.21 2008/11/19 03:44:14 jakemsr Exp $ */
+/* $OpenBSD: azalia.h,v 1.22 2008/11/27 23:30:58 jakemsr Exp $ */
/* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */
/*-
@@ -513,6 +513,7 @@ typedef int nid_t;
typedef struct {
nid_t nid;
+ int enable;
uint32_t widgetcap;
int type; /* = bit20-24 of widgetcap */
int nconnections;
@@ -564,15 +565,6 @@ typedef struct {
(nid >= (codec)->wstart && \
nid < (codec)->wend))
-#define PIN_STATUS(wid, conn) \
- do { \
- if ((wid)->type != COP_AWTYPE_PIN_COMPLEX) \
- (conn) = 0; \
- else \
- (conn) = \
- ((wid)->d.pin.config & CORB_CD_PORT_MASK) >> 30; \
- } while (0)
-
typedef struct {
int nconv;
nid_t conv[HDA_MAX_CHANNELS]; /* front, surround, clfe, side, ... */