i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* use macros when possible

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29188 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Jérôme Duval
2009-02-12 23:55:58 +00:00
parent 576cd2495d
commit 24283c487c
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
+8 -11
View File
@@ -130,13 +130,12 @@ dump_widget_amplifier_capabilities(hda_widget& widget, bool input)
if (capabilities == 0) if (capabilities == 0)
return; return;
dprintf("\t%s Amp: %sstep size: %ld dB, # steps: %ld, offset to 0 dB: " dprintf("\t%s Amp: %sstep size: %f dB, # steps: %ld, offset to 0 dB: "
"%ld\n", input ? "In" : "Out", "%ld\n", input ? "In" : "Out",
(capabilities & AMP_CAP_MUTE) != 0 ? "supports mute, " : "", (capabilities & AMP_CAP_MUTE) != 0 ? "supports mute, " : "",
(((capabilities & AMP_CAP_STEP_SIZE_MASK) AMP_CAP_STEP_SIZE(capabilities),
>> AMP_CAP_STEP_SIZE_SHIFT) + 1) / 4, AMP_CAP_NUM_STEPS(capabilities),
(capabilities & AMP_CAP_NUM_STEPS_MASK) >> AMP_CAP_NUM_STEPS_SHIFT, AMP_CAP_OFFSET(capabilities));
capabilities & AMP_CAP_OFFSET_MASK);
} }
@@ -989,19 +988,18 @@ dprintf("ENABLE EAPD pin widget %ld\n", widget.node_id);
if (widget.capabilities.output_amplifier != 0) { if (widget.capabilities.output_amplifier != 0) {
dprintf("UNMUTE/SET OUTPUT GAIN widget %ld (offset %ld)\n", widget.node_id, dprintf("UNMUTE/SET OUTPUT GAIN widget %ld (offset %ld)\n", widget.node_id,
widget.capabilities.output_amplifier & AMP_CAP_OFFSET_MASK); AMP_CAP_OFFSET(widget.capabilities.output_amplifier));
uint32 verb = MAKE_VERB(audioGroup->codec->addr, uint32 verb = MAKE_VERB(audioGroup->codec->addr,
widget.node_id, widget.node_id,
VID_SET_AMPLIFIER_GAIN_MUTE, VID_SET_AMPLIFIER_GAIN_MUTE,
AMP_SET_OUTPUT | AMP_SET_LEFT_CHANNEL AMP_SET_OUTPUT | AMP_SET_LEFT_CHANNEL
| AMP_SET_RIGHT_CHANNEL | AMP_SET_RIGHT_CHANNEL
| (widget.capabilities.output_amplifier | AMP_CAP_OFFSET(widget.capabilities.output_amplifier));
& AMP_CAP_OFFSET_MASK));
hda_send_verbs(audioGroup->codec, &verb, NULL, 1); hda_send_verbs(audioGroup->codec, &verb, NULL, 1);
} }
if (widget.capabilities.input_amplifier != 0) { if (widget.capabilities.input_amplifier != 0) {
dprintf("UNMUTE/SET INPUT GAIN widget %ld (offset %ld)\n", widget.node_id, dprintf("UNMUTE/SET INPUT GAIN widget %ld (offset %ld)\n", widget.node_id,
widget.capabilities.input_amplifier & AMP_CAP_OFFSET_MASK); AMP_CAP_OFFSET(widget.capabilities.input_amplifier));
for (uint32 i = 0; i < widget.num_inputs; i++) { for (uint32 i = 0; i < widget.num_inputs; i++) {
uint32 verb = MAKE_VERB(audioGroup->codec->addr, uint32 verb = MAKE_VERB(audioGroup->codec->addr,
widget.node_id, widget.node_id,
@@ -1009,8 +1007,7 @@ dprintf("UNMUTE/SET INPUT GAIN widget %ld (offset %ld)\n", widget.node_id,
AMP_SET_INPUT | AMP_SET_LEFT_CHANNEL AMP_SET_INPUT | AMP_SET_LEFT_CHANNEL
| AMP_SET_RIGHT_CHANNEL | AMP_SET_RIGHT_CHANNEL
| AMP_SET_INPUT_INDEX(i) | AMP_SET_INPUT_INDEX(i)
| (widget.capabilities.input_amplifier | AMP_CAP_OFFSET(widget.capabilities.input_amplifier));
& AMP_CAP_OFFSET_MASK));
hda_send_verbs(audioGroup->codec, &verb, NULL, 1); hda_send_verbs(audioGroup->codec, &verb, NULL, 1);
} }
} }