Changeset 159c722d in mainline for uspace/drv/audio/hdaudio/stream.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/stream.c (modified) (3 diffs)

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 */