Changeset 1412a184 in mainline

Timestamp:

2014-08-16T15:34:44Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a333b7f

Parents:

65b09c1

Message:

Stream management. Attempt some playback.

Location:

uspace/drv/audio/hdaudio

Files:

• Makefile (modified) (1 diff)
• codec.c (modified) (5 diffs)
• codec.h (modified) (1 diff)
• hdactl.c (modified) (7 diffs)
• hdactl.h (modified) (1 diff)
• spec/bdl.h (added)
• spec/codec.h (modified) (1 diff)
• spec/fmt.h (added)
• spec/regs.h (modified) (2 diffs)
• stream.c (added)
• stream.h (added)

uspace/drv/audio/hdaudio/Makefile

@@ -36 +36 @@
         regif.c \
         hdactl.c \
-        hdaudio.c
+        hdaudio.c \
+        stream.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/audio/hdaudio/codec.c

@@ -42 +42 @@
 #include "hdactl.h"
 #include "spec/codec.h"
+#include "spec/fmt.h"
+#include "stream.h"
+
+static int hda_ccmd(hda_codec_t *codec, int node, uint32_t vid, uint32_t payload,
+    uint32_t *resp)
+{
+        uint32_t verb;
+
+        verb = (codec->address << 28) | (node << 20) | (vid << 8) | payload;
+        return hda_cmd(codec->hda, verb, resp);
+}
 
 static int hda_get_parameter(hda_codec_t *codec, int node, hda_param_id_t param,
     uint32_t *resp)
 {
-        uint32_t verb;
-
-        verb = (codec->address << 28) | (node << 20) | ((hda_param_get) << 8) | param;
-        return hda_cmd(codec->hda, verb, resp);
+        return hda_ccmd(codec, node, hda_param_get, param, resp);
 }
 
@@ -87 +95 @@
 }
 
+/** Get Suppported PCM Size, Rates */
+static int hda_get_supp_rates(hda_codec_t *codec, int node, uint32_t *rates)
+{
+        return hda_get_parameter(codec, node, hda_supp_rates, rates);
+}
+
+/** Get Suppported Stream Formats */
+static int hda_get_supp_formats(hda_codec_t *codec, int node, uint32_t *fmts)
+{
+        return hda_get_parameter(codec, node, hda_supp_formats, fmts);
+}
+
+static int hda_set_converter_fmt(hda_codec_t *codec, int node, uint16_t fmt)
+{
+        return hda_ccmd(codec, node, hda_converter_fmt_set, fmt, NULL);
+}
+
+static int hda_set_converter_ctl(hda_codec_t *codec, int node, uint8_t stream,
+    uint8_t channel)
+{
+        uint32_t ctl;
+
+        ctl = (stream << cctl_stream_l) | (channel << cctl_channel_l);
+        return hda_ccmd(codec, node, hda_converter_ctl_set, ctl, NULL);
+}
+
 /** Get Audio Widget Capabilities */
 static int hda_get_aw_caps(hda_codec_t *codec, int node,
@@ -107 +141 @@
 static int hda_get_cfg_def(hda_codec_t *codec, int node, uint32_t *cfgdef)
 {
-        uint32_t verb;
-
-        verb = (codec->address << 28) | (node << 20) | ((hda_cfg_def_get) << 8) | 0;
-        return hda_cmd(codec->hda, verb, cfgdef);
+        return hda_ccmd(codec, node, hda_cfg_def_get, 0, cfgdef);
+}
+
+/** Get Amplifier Gain / Mute  */
+static int hda_get_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload,
+    uint32_t *resp)
+{
+        return hda_ccmd(codec, node, hda_amp_gain_mute_get, payload, resp);
+}
+
+static int hda_set_amp_gain_mute(hda_codec_t *codec, int node, uint16_t payload)
+{
+        return hda_ccmd(codec, node, hda_amp_gain_mute_set, payload, NULL);
 }
 
@@ -125 +168 @@
         uint32_t awcaps;
         uint32_t cfgdef;
+        uint32_t rates;
+        uint32_t formats;
 
         codec = calloc(1, sizeof(hda_codec_t));
@@ -171 +216 @@
                                     aw, cfgdef);
 
+                        } else if (awtype == awt_audio_output) {
+                                codec->out_aw = aw;
+                        }
+
+                        if ((awcaps & BIT_V(uint32_t, awc_out_amp_present)) != 0) {
+                                uint32_t ampcaps;
+                                uint32_t gmleft, gmright;
+
+                                rc = hda_get_parameter(codec, aw,
+                                    hda_out_amp_caps, &ampcaps);
+                                if (rc != EOK)
+                                        goto error;
+
+                                rc = hda_get_amp_gain_mute(codec, aw, 0x8000, &gmleft);
+                                if (rc != EOK)
+                                        goto error;
+
+                                rc = hda_get_amp_gain_mute(codec, aw, 0xc000, &gmright);
+                                if (rc != EOK)
+                                        goto error;
+
+                                ddf_msg(LVL_NOTE, "out amp caps 0x%x "
+                                    "gain/mute: L:0x%x R:0x%x",
+                                    ampcaps, gmleft, gmright);
+
+                                rc = hda_set_amp_gain_mute(codec, aw, 0xb04a);
+                                if (rc != EOK)
+                                        goto error;
                         }
                 }
         }
 
+        rc = hda_get_supp_rates(codec, codec->out_aw, &rates);
+        if (rc != EOK)
+                goto error;
+
+        rc = hda_get_supp_formats(codec, codec->out_aw, &formats);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "Output widget %d: rates=0x%x formats=0x%x",
+            codec->out_aw, rates, formats);
+
+        /* XXX Choose appropriate parameters */
+        uint32_t fmt;
+        /* 48 kHz, 16-bits, 1 channel */
+        fmt = fmt_bits_16 << fmt_bits_l;
+
+        /* Create stream */
+        ddf_msg(LVL_NOTE, "Create stream");
+        hda_stream_t *stream;
+        stream = hda_stream_create(hda, sdir_output, fmt);
+        if (stream == NULL)
+                goto error;
+
+        /* Configure converter */
+
+        ddf_msg(LVL_NOTE, "Configure converter format");
+        rc = hda_set_converter_fmt(codec, codec->out_aw, fmt);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "Configure converter stream, channel");
+        rc = hda_set_converter_ctl(codec, codec->out_aw, stream->sid, 0);
+        if (rc != EOK)
+                goto error;
+
+        ddf_msg(LVL_NOTE, "Start stream");
+        hda_stream_start(stream);
+
+        ddf_msg(LVL_NOTE, "Codec OK");
         return codec;
 error:

uspace/drv/audio/hdaudio/codec.h

@@ -41 +41 @@
         hda_t *hda;
         uint8_t address;
+        uint8_t out_aw;
 } hda_codec_t;
 

uspace/drv/audio/hdaudio/hdactl.c

@@ -102 +102 @@
         uint8_t sizecap;
         uint8_t selsz;
-        bool ok64bit;
         int rc;
 
@@ -131 +130 @@
         hda->ctl->corb_entries = hda_rb_entries(selsz);
 
-        ddf_msg(LVL_NOTE, "Read GCAP");
-        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
-        ok64bit = (gcap & BIT_V(uint8_t, gcap_64ok)) != 0;
-        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ok64bit);
 
         /*
@@ -142 +137 @@
         hda->ctl->corb_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(hda->ctl->corb_entries * sizeof(uint32_t),
-            ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
+            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
             &hda->ctl->corb_phys, &hda->ctl->corb_virt);
 
@@ -178 +173 @@
         uint8_t sizecap;
         uint8_t selsz;
-        bool ok64bit;
         int rc;
 
@@ -207 +201 @@
         hda->ctl->rirb_entries = hda_rb_entries(selsz);
 
-        ddf_msg(LVL_NOTE, "Read GCAP");
-        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
-        ok64bit = (gcap & BIT_V(uint8_t, gcap_64ok)) != 0;
-        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ok64bit);
-
         /*
          * RIRB must be aligned to 128 bytes. If 64OK is not set,
@@ -218 +207 @@
         hda->ctl->rirb_virt = AS_AREA_ANY;
         rc = dmamem_map_anonymous(hda->ctl->rirb_entries * sizeof(uint64_t),
-            ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
+            hda->ctl->ok64bit ? 0 : DMAMEM_4GiB, AS_AREA_READ | AS_AREA_WRITE, 0,
             &hda->ctl->rirb_phys, &hda->ctl->rirb_virt);
 
@@ -434 +423 @@
         ddf_msg(LVL_NOTE, "Controller is out of reset.");
 
+        ddf_msg(LVL_NOTE, "Read GCAP");
+        uint16_t gcap = hda_reg16_read(&hda->regs->gcap);
+        ctl->ok64bit = (gcap & BIT_V(uint16_t, gcap_64ok)) != 0;
+        ctl->oss = BIT_RANGE_EXTRACT(uint16_t, gcap_oss_h, gcap_oss_l, gcap);
+        ctl->iss = BIT_RANGE_EXTRACT(uint16_t, gcap_iss_h, gcap_iss_l, gcap);
+        ctl->bss = BIT_RANGE_EXTRACT(uint16_t, gcap_bss_h, gcap_bss_l, gcap);
+        ddf_msg(LVL_NOTE, "GCAP: 0x%x (64OK=%d)", gcap, ctl->ok64bit);
+
         /* Give codecs enough time to enumerate themselves */
         async_usleep(codec_enum_wait_us);

uspace/drv/audio/hdaudio/hdactl.h

@@ -36 +36 @@
 #define HDACTL_H
 
+#include <stdbool.h>
 #include "hdaudio.h"
 
 typedef struct hda_ctl {
+        bool ok64bit;
+        int iss;
+        int oss;
+        int bss;
+
         uintptr_t corb_phys;
         void *corb_virt;

uspace/drv/audio/hdaudio/spec/codec.h

@@ -336 +336 @@
 } hda_awidget_type_t;
 
+/** Converter Control bits */
+typedef enum {
+        /** Stream (H) */
+        cctl_stream_h = 7,
+        /** Stream (L) */
+        cctl_stream_l = 4,
+        /** Channel (H) */
+        cctl_channel_h = 3,
+        /** Channel (L) */
+        cctl_channel_l = 0
+} hda_converter_ctl_bits_t;
+
 #endif
 

uspace/drv/audio/hdaudio/spec/regs.h

@@ -40 +40 @@
 /** Stream Descriptor registers */
 typedef struct {
-        /** Control */
-        uint16_t ctl;
+        /** Control 1 */
+        uint8_t ctl1;
+        /** Control 2 */
+        uint8_t ctl2;
+        /** Control 3 */
+        uint8_t ctl3;
         /** Status */
         uint8_t sts;
@@ -142 +146 @@
         uint32_t icii;
         /** Immediate Command Status */
-        uint32_t icis;
+        uint16_t icis;
         /** Reserved */
         uint8_t reserved8[6];
         /** DMA Position Buffer Lower Base */
-        uint32_t dpiblbase;
+        uint32_t dplbase;
         /** DMA Position Buffer Upper Base */
-        uint32_t dpibubase;
+        uint32_t dpubase;
         /** Reserved */
         uint8_t reserved9[8];