Changeset 159c722d in mainline

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.

Location:

uspace/drv/audio/hdaudio

Files:

• codec.c (modified) (1 diff)
• hdaudio.c (modified) (1 diff)
• hdaudio.h (modified) (1 diff)
• pcm_iface.c (modified) (6 diffs)
• pcm_iface.h (modified) (1 diff)
• stream.c (modified) (3 diffs)

uspace/drv/audio/hdaudio/codec.c

@@ -279 +279 @@
         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);
 
         /* Configure converter */

uspace/drv/audio/hdaudio/hdaudio.c

@@ -354 +354 @@
         if (0) ddf_msg(LVL_NOTE, "## interrupt ##");
 //      ddf_msg(LVL_NOTE, "interrupt arg4=0x%x", (int)IPC_GET_ARG4(*icall));
+        if (IPC_GET_ARG3(*icall) != 0) {
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+/*              hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);
+                hda_pcm_event(hda, PCM_EVENT_FRAMES_PLAYED);*/
+        }
         hda_ctl_interrupt(hda->ctl);
 }

uspace/drv/audio/hdaudio/hdaudio.h

@@ -45 +45 @@
 typedef struct hda {
         async_sess_t *parent_sess;
+        async_sess_t *ev_sess;
         ddf_fun_t *fun_pcm;
         uint64_t rwbase;

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);
+}
+
 /** @}
  */

uspace/drv/audio/hdaudio/pcm_iface.h

@@ -38 +38 @@
 #include <audio_pcm_iface.h>
 
+#include "hdaudio.h"
+
 extern audio_pcm_iface_t hda_pcm_iface;
+extern void hda_pcm_event(hda_t *, pcm_event_t);
 
 #endif

uspace/drv/audio/hdaudio/stream.c

@@ -54 +54 @@
         uintptr_t buffer_phys;
         size_t i;
-        size_t j, k;
+//      size_t j, k;
         int rc;
 
-        stream->nbuffers = 2;
+        stream->nbuffers = 4;
         stream->bufsize = 16384;
 
@@ -84 +84 @@
 
         /* Allocate buffers */
-
+/*
         for (i = 0; i < stream->nbuffers; i++) {
                 buffer = AS_AREA_ANY;
@@ -108 +108 @@
                 }
         }
+*/
+//      async_usleep(1000*1000);
+        /* audio_pcm_iface requires a single contiguous buffer */
+        buffer = AS_AREA_ANY;
+        rc = dmamem_map_anonymous(stream->bufsize * stream->nbuffers,
+            stream->hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
+            0, &buffer_phys, &buffer);
+        if (rc != EOK) {
+                ddf_msg(LVL_NOTE, "dmamem_map_anon -> %d", rc);
+                goto error;
+        }
+
+        for (i = 0; i < stream->nbuffers; i++) {
+                stream->buf[i] = buffer + i * stream->bufsize;
+                stream->buf_phys[i] = buffer_phys + i * stream->bufsize;
+
+                ddf_msg(LVL_NOTE, "Stream buf phys=0x%llx virt=%p",
+                    (long long unsigned)(uintptr_t)stream->buf[i],
+                    (void *)stream->buf_phys[i]);
+/*              k = 0;
+                for (j = 0; j < stream->bufsize / 2; j++) {
+                        int16_t *bp = stream->buf[i];
+                        bp[j] = (k > 128) ? -10000 : 10000;
+                        ++k;
+                        if (k >= 256)
+                                k = 0;
+                }
+*/
+        }
 
         /* Fill in BDL */