Changeset 99cb9bf in mainline for uspace/drv/audio/hdaudio/codec.c

Timestamp:

2014-08-26T08:58:47Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

159c722d

Parents:

93c3163

Message:

Implement more of audio_pcm_iface.

File:

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

uspace/drv/audio/hdaudio/codec.c

@@ -259 +259 @@
             codec->out_aw, rates, formats);
 
-        /* XXX Choose appropriate parameters */
-        uint32_t fmt;
-        /* 48 kHz, 16-bits, 1 channel */
-        fmt = fmt_bits_16 << fmt_bits_l;
-
-        /* Create stream */
-        ddf_msg(LVL_NOTE, "Create stream");
-        hda_stream_t *stream;
-        stream = hda_stream_create(hda, sdir_output, fmt);
-        if (stream == NULL)
-                goto error;
-
-        /* Configure converter */
-
-        ddf_msg(LVL_NOTE, "Configure converter format");
-        rc = hda_set_converter_fmt(codec, codec->out_aw, fmt);
-        if (rc != EOK)
-                goto error;
-
-        ddf_msg(LVL_NOTE, "Configure converter stream, channel");
-        rc = hda_set_converter_ctl(codec, codec->out_aw, stream->sid, 0);
-        if (rc != EOK)
-                goto error;
-
-        ddf_msg(LVL_NOTE, "Start stream");
-        hda_stream_start(stream);
-
         ddf_msg(LVL_NOTE, "Codec OK");
         return codec;
@@ -299 +272 @@
 }
 
+int hda_out_converter_setup(hda_codec_t *codec, uint8_t sid)
+{
+        int rc;
+
+        /* XXX Choose appropriate parameters */
+        uint32_t fmt;
+        /* 48 kHz, 16-bits, 1 channel */
+        fmt = fmt_bits_16 << fmt_bits_l;
+
+        /* Configure converter */
+
+        ddf_msg(LVL_NOTE, "Configure converter format");
+        rc = hda_set_converter_fmt(codec, codec->out_aw, fmt);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "Configure converter stream, channel");
+        rc = hda_set_converter_ctl(codec, codec->out_aw, sid, 0);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** @}
  */