Changeset 3fec817 in mainline

Timestamp:

2014-09-04T15:51:56Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

de16f89

Parents:

149dd52d

Message:

Get format from stream.

Location:

uspace/drv/audio/hdaudio

Files:

• codec.c (modified) (2 diffs)
• codec.h (modified) (2 diffs)
• pcm_iface.c (modified) (1 diff)
• stream.h (modified) (1 diff)

uspace/drv/audio/hdaudio/codec.c

@@ -547 +547 @@
 }
 
-int hda_out_converter_setup(hda_codec_t *codec, uint8_t sid)
+int hda_out_converter_setup(hda_codec_t *codec, hda_stream_t *stream)
 {
         int rc;
@@ -556 +556 @@
                 out_aw = codec->out_aw_list[i];
 
-                /* XXX Choose appropriate parameters */
-                uint32_t fmt;
-                /* 48 kHz, 16-bits, 1 channel */
-                fmt = (fmt_base_44khz << fmt_base) | (fmt_bits_16 << fmt_bits_l) | 1;
-
                 /* Configure converter */
 
                 ddf_msg(LVL_NOTE, "Configure converter format");
-                rc = hda_set_converter_fmt(codec, out_aw, fmt);
+                rc = hda_set_converter_fmt(codec, out_aw, stream->fmt);
                 if (rc != EOK)
                         goto error;
 
                 ddf_msg(LVL_NOTE, "Configure converter stream, channel");
-                rc = hda_set_converter_ctl(codec, out_aw, sid, 0);
+                rc = hda_set_converter_ctl(codec, out_aw, stream->sid, 0);
                 if (rc != EOK)
                         goto error;

uspace/drv/audio/hdaudio/codec.h

@@ -37 +37 @@
 
 #include "hdaudio.h"
+#include "stream.h"
 
 #define MAX_OUT_AW 256
@@ -50 +51 @@
 extern hda_codec_t *hda_codec_init(hda_t *, uint8_t);
 extern void hda_codec_fini(hda_codec_t *);
-extern int hda_out_converter_setup(hda_codec_t *, uint8_t);
+extern int hda_out_converter_setup(hda_codec_t *, hda_stream_t *);
 
 #endif

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -217 +217 @@
         ddf_msg(LVL_NOTE, "hda_start_playback()");
 
-        rc = hda_out_converter_setup(hda->ctl->codec, hda->pcm_stream->sid);
+        rc = hda_out_converter_setup(hda->ctl->codec, hda->pcm_stream);
         if (rc != EOK)
                 return rc;

uspace/drv/audio/hdaudio/stream.h

@@ -34 +34 @@
 
 #ifndef STREAM_H
-#define STERAM_H
+#define STREAM_H
 
 #include "hdaudio.h"