Changes in uspace/drv/audio/hdaudio/stream.c [0e4c5f0:57a2208] in mainline

File:

• uspace/drv/audio/hdaudio/stream.c (modified) (9 diffs)

uspace/drv/audio/hdaudio/stream.c

@@ -48 +48 @@
 #include "stream.h"
 
-int hda_stream_buffers_alloc(hda_t *hda, hda_stream_buffers_t **rbufs)
+static int hda_stream_buffers_alloc(hda_stream_t *stream)
 {
         void *bdl;
         void *buffer;
         uintptr_t buffer_phys;
-        hda_stream_buffers_t *bufs = NULL;
         size_t i;
 //      size_t j, k;
         int rc;
 
-        bufs = calloc(1, sizeof(hda_stream_buffers_t));
-        if (bufs == NULL) {
-                rc = ENOMEM;
-                goto error;
-        }
-
-        bufs->nbuffers = 4;
-        bufs->bufsize = 16384;
+        stream->nbuffers = 4;
+        stream->bufsize = 16384;
 
         /*
@@ -72 +65 @@
          */
         bdl = AS_AREA_ANY;
-        rc = dmamem_map_anonymous(bufs->nbuffers * sizeof(hda_buffer_desc_t),
-            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
-            0, &bufs->bdl_phys, &bdl);
+        rc = dmamem_map_anonymous(stream->nbuffers * sizeof(hda_buffer_desc_t),
+            stream->hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
+            0, &stream->bdl_phys, &bdl);
         if (rc != EOK)
                 goto error;
 
-        bufs->bdl = bdl;
+        stream->bdl = bdl;
 
         /* Allocate arrays of buffer pointers */
 
-        bufs->buf = calloc(bufs->nbuffers, sizeof(void *));
-        if (bufs->buf == NULL)
-                goto error;
-
-        bufs->buf_phys = calloc(bufs->nbuffers, sizeof(uintptr_t));
-        if (bufs->buf_phys == NULL)
+        stream->buf = calloc(stream->nbuffers, sizeof(void *));
+        if (stream->buf == NULL)
+                goto error;
+
+        stream->buf_phys = calloc(stream->nbuffers, sizeof(uintptr_t));
+        if (stream->buf_phys == NULL)
                 goto error;
 
         /* Allocate buffers */
 /*
-        for (i = 0; i < bufs->nbuffers; i++) {
+        for (i = 0; i < stream->nbuffers; i++) {
                 buffer = AS_AREA_ANY;
-                rc = dmamem_map_anonymous(bufs->bufsize,
-                    bufs->hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
+                rc = dmamem_map_anonymous(stream->bufsize,
+                    stream->hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
                     0, &buffer_phys, &buffer);
                 if (rc != EOK)
@@ -103 +96 @@
                     (unsigned long long)buffer_phys, buffer);
 
-                bufs->buf[i] = buffer;
-                bufs->buf_phys[i] = buffer_phys;
+                stream->buf[i] = buffer;
+                stream->buf_phys[i] = buffer_phys;
 
                 k = 0;
-                for (j = 0; j < bufs->bufsize / 2; j++) {
-                        int16_t *bp = bufs->buf[i];
+                for (j = 0; j < stream->bufsize / 2; j++) {
+                        int16_t *bp = stream->buf[i];
                         bp[j] = (k > 128) ? -100 : 100;
                         ++k;
@@ -118 +111 @@
         /* audio_pcm_iface requires a single contiguous buffer */
         buffer = AS_AREA_ANY;
-        rc = dmamem_map_anonymous(bufs->bufsize * bufs->nbuffers,
-            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE,
+        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) {
@@ -126 +119 @@
         }
 
-        for (i = 0; i < bufs->nbuffers; i++) {
-                bufs->buf[i] = buffer + i * bufs->bufsize;
-                bufs->buf_phys[i] = buffer_phys + i * bufs->bufsize;
+        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)bufs->buf[i],
-                    (void *)bufs->buf_phys[i]);
+                    (long long unsigned)(uintptr_t)stream->buf[i],
+                    (void *)stream->buf_phys[i]);
 /*              k = 0;
-                for (j = 0; j < bufs->bufsize / 2; j++) {
-                        int16_t *bp = bufs->buf[i];
+                for (j = 0; j < stream->bufsize / 2; j++) {
+                        int16_t *bp = stream->buf[i];
                         bp[j] = (k > 128) ? -10000 : 10000;
                         ++k;
@@ -145 +138 @@
 
         /* Fill in BDL */
-        for (i = 0; i < bufs->nbuffers; i++) {
-                bufs->bdl[i].address = host2uint64_t_le(bufs->buf_phys[i]);
-                bufs->bdl[i].length = host2uint32_t_le(bufs->bufsize);
-                bufs->bdl[i].flags = BIT_V(uint32_t, bdf_ioc);
-        }
-
-        *rbufs = bufs;
+        for (i = 0; i < stream->nbuffers; i++) {
+                stream->bdl[i].address = host2uint64_t_le(stream->buf_phys[i]);
+                stream->bdl[i].length = host2uint32_t_le(stream->bufsize);
+                stream->bdl[i].flags = BIT_V(uint32_t, bdf_ioc);
+        }
+
         return EOK;
 error:
-        hda_stream_buffers_free(bufs);
         return ENOMEM;
 }
 
-void hda_stream_buffers_free(hda_stream_buffers_t *bufs)
-{
-        if (bufs == NULL)
-                return;
-
-        /* XXX */
-        free(bufs);
-}
-
 static void hda_stream_desc_configure(hda_stream_t *stream)
 {
         hda_sdesc_regs_t *sdregs;
-        hda_stream_buffers_t *bufs = stream->buffers;
         uint8_t ctl1;
         uint8_t ctl3;
@@ -180 +161 @@
         hda_reg8_write(&sdregs->ctl3, ctl3);
         hda_reg8_write(&sdregs->ctl1, ctl1);
-        hda_reg32_write(&sdregs->cbl, bufs->nbuffers * bufs->bufsize);
-        hda_reg16_write(&sdregs->lvi, bufs->nbuffers - 1);
+        hda_reg32_write(&sdregs->cbl, stream->nbuffers * stream->bufsize);
+        hda_reg16_write(&sdregs->lvi, stream->nbuffers - 1);
         hda_reg16_write(&sdregs->fmt, stream->fmt);
-        hda_reg32_write(&sdregs->bdpl, LOWER32(bufs->bdl_phys));
-        hda_reg32_write(&sdregs->bdpu, UPPER32(bufs->bdl_phys));
+        hda_reg32_write(&sdregs->bdpl, LOWER32(stream->bdl_phys));
+        hda_reg32_write(&sdregs->bdpu, UPPER32(stream->bdl_phys));
 }
 
@@ -224 +205 @@
 
 hda_stream_t *hda_stream_create(hda_t *hda, hda_stream_dir_t dir,
-    hda_stream_buffers_t *bufs, uint32_t fmt)
+    uint32_t fmt)
 {
         hda_stream_t *stream;
-        uint8_t sdid;
+        int rc;
 
         stream = calloc(1, sizeof(hda_stream_t));
@@ -233 +214 @@
                 return NULL;
 
-        sdid = 0;
-
-        switch (dir) {
-        case sdir_input:
-                sdid = 0; /* XXX Allocate - first input SDESC */
-                break;
-        case sdir_output:
-                sdid = hda->ctl->iss; /* XXX Allocate - First output SDESC */
-                break;
-        case sdir_bidi:
-                sdid = hda->ctl->iss + hda->ctl->oss; /* XXX Allocate - First bidi SDESC */
-                break;
-        }
-
         stream->hda = hda;
         stream->dir = dir;
         stream->sid = 1; /* XXX Allocate this */
-        stream->sdid = sdid;
+        stream->sdid = hda->ctl->iss; /* XXX Allocate - First output SDESC */
         stream->fmt = fmt;
-        stream->buffers = bufs;
 
         ddf_msg(LVL_NOTE, "snum=%d sdidx=%d", stream->sid, stream->sdid);
+
+        ddf_msg(LVL_NOTE, "Allocate buffers");
+        rc = hda_stream_buffers_alloc(stream);
+        if (rc != EOK)
+                goto error;
 
         ddf_msg(LVL_NOTE, "Configure stream descriptor");
         hda_stream_desc_configure(stream);
         return stream;
+error:
+        return NULL;
 }