Changes in uspace/drv/audio/hdaudio/codec.c [0d59ea7e:cf78637] in mainline

File:

• uspace/drv/audio/hdaudio/codec.c (modified) (6 diffs)

uspace/drv/audio/hdaudio/codec.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2014 Jiri Svoboda
  * All rights reserved.
  *
@@ -512 +512 @@
         codec->address = address;
         codec->in_aw = -1;
-        codec->out_aw = -1;
 
         rc = hda_get_subnc(codec, 0, &sfg, &nfg);
@@ -585 +584 @@
                                         goto error;
                         } else if (awtype == awt_audio_output) {
+                                codec->out_aw_list[codec->out_aw_num++] = aw;
+
                                 rc = hda_get_supp_rates(codec, aw, &rates);
                                 if (rc != EOK)
@@ -593 +594 @@
                                         goto error;
 
-                                if (rates != 0 && formats != 0 &&
-                                    codec->out_aw < 0) {
-                                        ddf_msg(LVL_DEBUG, "Selected output "
-                                            "widget %d\n", aw);
-                                        codec->out_aw = aw;
-                                } else {
-                                        ddf_msg(LVL_DEBUG, "Ignoring output "
-                                            "widget %d\n", aw);
-                                }
-
-                                ddf_msg(LVL_NOTE, "Output widget %d: rates=0x%x formats=0x%x",
+                                ddf_msg(LVL_DEBUG, "Output widget %d: rates=0x%x formats=0x%x",
                                     aw, rates, formats);
-                                codec->out_aw_rates = rates;
-                                codec->out_aw_formats = formats;
                         } else if (awtype == awt_audio_input) {
                                 if (codec->in_aw < 0) {
@@ -627 +616 @@
                                 ddf_msg(LVL_DEBUG, "Input widget %d: rates=0x%x formats=0x%x",
                                     aw, rates, formats);
-                                codec->in_aw_rates = rates;
-                                codec->in_aw_formats = formats;
                         }
 
@@ -657 +644 @@
 {
         errno_t rc;
-
-        /* Configure converter */
-        ddf_msg(LVL_DEBUG, "Configure output converter format / %d",
-            codec->out_aw);
-        rc = hda_set_converter_fmt(codec, codec->out_aw, stream->fmt);
-        if (rc != EOK)
-                goto error;
-
-        ddf_msg(LVL_DEBUG, "Configure output converter stream, channel");
-        rc = hda_set_converter_ctl(codec, codec->out_aw, stream->sid, 0);
-        if (rc != EOK)
-                goto error;
+        int out_aw;
+        int i;
+
+        for (i = 0; i < codec->out_aw_num; i++) {
+                out_aw = codec->out_aw_list[i];
+
+                /* Configure converter */
+
+                ddf_msg(LVL_DEBUG, "Configure output converter format");
+                rc = hda_set_converter_fmt(codec, out_aw, stream->fmt);
+                if (rc != EOK)
+                        goto error;
+
+                ddf_msg(LVL_DEBUG, "Configure output converter stream, channel");
+                rc = hda_set_converter_ctl(codec, out_aw, stream->sid, 0);
+                if (rc != EOK)
+                        goto error;
+        }
 
         return EOK;