summaryrefslogtreecommitdiff
path: root/sys/dev/pci/azalia.h
diff options
context:
space:
mode:
authorJacob Meuser <jakemsr@cvs.openbsd.org>2009-04-24 15:31:19 +0000
committerJacob Meuser <jakemsr@cvs.openbsd.org>2009-04-24 15:31:19 +0000
commit4eaed026c1723f98a6af45ad5003e165cf161893 (patch)
treeb88999d5871c2ac239ce6d82bd6a94faa9ade480 /sys/dev/pci/azalia.h
parentf878e6be882338da696fb52540a7644782f92fd4 (diff)
after all widgets have been initialized, loop through all widgets
and do some further initialization and information gathering: - disable mixer and selector widgets that don't have any enabled connections - create lists of analog and digital input and output converters - find the internal/fixed connection microphone and speaker, and which converters they are connected to by default - create a list of jack sensing capable pins some of this was already being done in other places, but moved here for simplification/better organization
Diffstat (limited to 'sys/dev/pci/azalia.h')
-rw-r--r--sys/dev/pci/azalia.h21
1 files changed, 13 insertions, 8 deletions
diff --git a/sys/dev/pci/azalia.h b/sys/dev/pci/azalia.h
index 44b797d0b6c..5abbbcaea34 100644
--- a/sys/dev/pci/azalia.h
+++ b/sys/dev/pci/azalia.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: azalia.h,v 1.40 2009/01/05 09:46:26 jakemsr Exp $ */
+/* $OpenBSD: azalia.h,v 1.41 2009/04/24 15:31:18 jakemsr Exp $ */
/* $NetBSD: azalia.h,v 1.6 2006/01/16 14:15:26 kent Exp $ */
/*-
@@ -639,17 +639,22 @@ typedef struct codec_t {
int nmixers, maxmixers;
mixer_item_t *mixers;
- struct audio_format* formats;
+ struct audio_format *formats;
int nformats;
- struct audio_encoding* encs;
+ struct audio_encoding *encs;
int nencs;
- int headphones;
- int hp_dac;
- int speaker;
- int spkr_dac;
+ nid_t a_dacs[HDA_MAX_CHANNELS], a_dacs_d[HDA_MAX_CHANNELS];
+ int na_dacs, na_dacs_d;
+ nid_t a_adcs[HDA_MAX_CHANNELS], a_adcs_d[HDA_MAX_CHANNELS];
+ int na_adcs, na_adcs_d;
+
+ nid_t mic; /* fixed (internal) mic */
+ nid_t mic_adc;
+ nid_t speaker; /* fixed (internal) speaker */
+ nid_t spkr_dac;
+
int spkr_muters;
- int mic;
volgroup_t playvols;
volgroup_t recvols;