Changeset 159c722d in mainline for uspace/drv/audio/hdaudio/pcm_iface.c

Timestamp:

2014-08-26T10:10:50Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6747b929

Parents:

99cb9bf

Message:

Garbled playback via hound.

File:

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

uspace/drv/audio/hdaudio/pcm_iface.c

@@ -43 +43 @@
 #include "hdactl.h"
 #include "hdaudio.h"
+#include "pcm_iface.h"
 #include "spec/fmt.h"
 #include "stream.h"
@@ -155 +156 @@
         uint32_t fmt;
         /* 48 kHz, 16-bits, 1 channel */
-        fmt = fmt_bits_16 << fmt_bits_l;
+        fmt = (fmt_base_44khz << fmt_base) | (fmt_bits_16 << fmt_bits_l);
 
         ddf_msg(LVL_NOTE, "hda_get_buffer() - create stream");
@@ -165 +166 @@
         /* XXX This is only one buffer */
         *buffer = hda->pcm_stream->buf[0];
-        *size = hda->pcm_stream->bufsize;
+        *size = hda->pcm_stream->bufsize * hda->pcm_stream->nbuffers;
 
         ddf_msg(LVL_NOTE, "hda_get_buffer() retturing EOK, buffer=%p, size=%zu",
@@ -180 +181 @@
 static int hda_set_event_session(ddf_fun_t *fun, async_sess_t *sess)
 {
+        hda_t *hda = fun_to_hda(fun);
+
         ddf_msg(LVL_NOTE, "hda_set_event_session()");
-        return ENOTSUP;
+        hda->ev_sess = sess;
+        return EOK;
 }
 
 static async_sess_t *hda_get_event_session(ddf_fun_t *fun)
 {
+        hda_t *hda = fun_to_hda(fun);
+
         ddf_msg(LVL_NOTE, "hda_get_event_session()");
-        return NULL;
+        return hda->ev_sess;
 }
 
@@ -215 +221 @@
                 return rc;
 
+        async_usleep(1000*1000);
         hda_stream_start(hda->pcm_stream);
         return EOK;
@@ -238 +245 @@
 }
 
+void hda_pcm_event(hda_t *hda, pcm_event_t event)
+{
+        async_exch_t *exchange;
+
+        if (hda->ev_sess == NULL) {
+                ddf_log_warning("No one listening for event %u", event);
+                return;
+        }
+
+        exchange = async_exchange_begin(hda->ev_sess);
+        async_msg_1(exchange, event, 0);
+        async_exchange_end(exchange);
+}
+
 /** @}
  */