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

hda: reorganized the code for sense checking.

Browse Source 
* should help with #9965
This commit is contained in:
Jerome Duval
2013-09-18 18:26:26 +02:00
parent 33f263cb01
commit bd3bcbe5d6
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/hda/hda_codec.cpp
+7 -9
View File
@@ -1154,7 +1154,7 @@ TRACE("build tree!\n");
static void static void
hda_codec_switch_init(hda_audio_group* audioGroup) hda_audio_group_switch_init(hda_audio_group* audioGroup)
{ {
for (uint32 i = 0; i < audioGroup->widget_count; i++) { for (uint32 i = 0; i < audioGroup->widget_count; i++) {
hda_widget& widget = audioGroup->widgets[i]; hda_widget& widget = audioGroup->widgets[i];
@@ -1175,10 +1175,8 @@ hda_codec_switch_init(hda_audio_group* audioGroup)
static void static void
hda_codec_check_sense(hda_codec* codec, bool disable) hda_audio_group_check_sense(hda_audio_group* audioGroup, bool disable)
{ {
hda_audio_group* audioGroup = codec->audio_groups[0];
for (uint32 i = 0; i < audioGroup->widget_count; i++) { for (uint32 i = 0; i < audioGroup->widget_count; i++) {
hda_widget& widget = audioGroup->widgets[i]; hda_widget& widget = audioGroup->widgets[i];
@@ -1233,7 +1231,8 @@ hda_codec_switch_handler(hda_codec* codec)
codec->unsol_response_read %= MAX_CODEC_UNSOL_RESPONSES; codec->unsol_response_read %= MAX_CODEC_UNSOL_RESPONSES;
bool disable = response & 1; bool disable = response & 1;
hda_codec_check_sense(codec, disable); hda_audio_group* audioGroup = codec->audio_groups[0];
hda_audio_group_check_sense(audioGroup, disable);
} }
return B_OK; return B_OK;
} }
@@ -1285,8 +1284,8 @@ hda_codec_new_audio_group(hda_codec* codec, uint32 audioGroupNodeID)
if (hda_audio_group_build_tree(audioGroup) != B_OK) if (hda_audio_group_build_tree(audioGroup) != B_OK)
goto err; goto err;
hda_codec_switch_init(audioGroup); hda_audio_group_switch_init(audioGroup);
audioGroup->playback_stream = hda_stream_new(audioGroup, STREAM_PLAYBACK); audioGroup->playback_stream = hda_stream_new(audioGroup, STREAM_PLAYBACK);
audioGroup->record_stream = hda_stream_new(audioGroup, STREAM_RECORD); audioGroup->record_stream = hda_stream_new(audioGroup, STREAM_RECORD);
TRACE("hda: streams playback %p, record %p\n", audioGroup->playback_stream, TRACE("hda: streams playback %p, record %p\n", audioGroup->playback_stream,
@@ -1295,6 +1294,7 @@ hda_codec_new_audio_group(hda_codec* codec, uint32 audioGroupNodeID)
if (audioGroup->playback_stream != NULL if (audioGroup->playback_stream != NULL
|| audioGroup->record_stream != NULL) { || audioGroup->record_stream != NULL) {
codec->audio_groups[codec->num_audio_groups++] = audioGroup; codec->audio_groups[codec->num_audio_groups++] = audioGroup;
hda_audio_group_check_sense(audioGroup, false);
return B_OK; return B_OK;
} }
@@ -1527,8 +1527,6 @@ hda_codec_new(hda_controller* controller, uint32 codecAddress)
} }
} }
hda_codec_check_sense(codec, false);
codec->unsol_response_thread = spawn_kernel_thread( codec->unsol_response_thread = spawn_kernel_thread(
(status_t(*)(void*))hda_codec_switch_handler, (status_t(*)(void*))hda_codec_switch_handler,
"hda_codec_unsol_thread", B_LOW_PRIORITY, codec); "hda_codec_unsol_thread", B_LOW_PRIORITY, codec);