Changeset 903eff5 in mainline for uspace/drv/audio/hdaudio/stream.c

Timestamp:

2014-08-25T11:05:05Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

31ccd42a

Parents:

a10f3f3

Message:

First sound.

File:

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

uspace/drv/audio/hdaudio/stream.c

@@ -34 +34 @@
 
 #include <as.h>
+#include <bitops.h>
+#include <byteorder.h>
 #include <ddf/log.h>
 #include <ddi.h>
 #include <errno.h>
+#include <macros.h>
 #include <stdlib.h>
 
@@ -90 +93 @@
                         goto error;
 
+                ddf_msg(LVL_NOTE, "Stream buf phys=0x%llx virt=%p",
+                    (unsigned long long)buffer_phys, buffer);
+
                 stream->buf[i] = buffer;
                 stream->buf_phys[i] = buffer_phys;
@@ -105 +111 @@
         /* Fill in BDL */
         for (i = 0; i < stream->nbuffers; i++) {
-                stream->bdl[i].address = stream->buf_phys[i];
-                stream->bdl[i].length = stream->bufsize;
-                stream->bdl[i].flags = 0;
+                stream->bdl[i].address = host2uint64_t_le(stream->buf_phys[i]);
+                stream->bdl[i].length = host2uint32_t_le(stream->bufsize);
+                stream->bdl[i].flags = 0/*BIT_V(uint32_t, bdf_ioc)*/;
         }
 
@@ -118 +124 @@
 {
         hda_sdesc_regs_t *sdregs;
+        uint8_t ctl1;
+        uint8_t ctl3;
+
+        ctl3 = (stream->sid << 4);
+        ctl1 = 0x4;
 
         sdregs = &stream->hda->regs->sdesc[stream->sdid];
+        hda_reg8_write(&sdregs->ctl3, ctl3);
+        hda_reg8_write(&sdregs->ctl1, ctl1);
         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(stream->bdl_phys));
+        hda_reg32_write(&sdregs->bdpu, UPPER32(stream->bdl_phys));
 }