Changeset d2d5329 in mainline

Timestamp:

2014-08-14T14:21:28Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

65b09c1

Parents:

8d070710

Message:

Discover function groups and widgets.

Location:

uspace/drv/audio/hdaudio

Files:

• Makefile (modified) (1 diff)
• codec.c (added)
• codec.h (added)
• hdactl.c (modified) (6 diffs)
• hdactl.h (modified) (1 diff)
• spec/codec.h (modified) (2 diffs)

uspace/drv/audio/hdaudio/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        codec.c \
         regif.c \
         hdactl.c \

uspace/drv/audio/hdaudio/hdactl.c

@@ -42 +42 @@
 #include <stdint.h>
 
+#include "codec.h"
 #include "hdactl.h"
 #include "regif.h"
@@ -49 +50 @@
         ctrl_init_wait_max = 10,
         codec_enum_wait_us = 512,
-        corb_wait_max = 10
+        corb_wait_max = 10,
+        rirb_wait_max = 100
 };
 
@@ -231 +233 @@
 
         /* Set RINTCNT - Qemu won't read from CORB if this is zero */
-        hda_reg16_write(&hda->regs->rintcnt, 2);
+        hda_reg16_write(&hda->regs->rintcnt, 128);
 
         hda->ctl->rirb_rp = 0;
@@ -336 +338 @@
 }
 
-static void hda_rirb_read(hda_t *hda)
+static int hda_rirb_read(hda_t *hda, hda_rirb_entry_t *data, size_t count)
 {
         size_t wp;
         hda_rirb_entry_t resp;
         hda_rirb_entry_t *rirb;
+        int wcnt;
 
         rirb = (hda_rirb_entry_t *)hda->ctl->rirb_virt;
 
-        wp = hda_get_rirbwp(hda);
-        ddf_msg(LVL_NOTE, "hda_rirb_read: wp=%d", wp);
-        while (hda->ctl->rirb_rp != wp) {
-                ++hda->ctl->rirb_rp;
-                resp = rirb[hda->ctl->rirb_rp];
-
-                ddf_msg(LVL_NOTE, "RESPONSE resp=0x%x respex=0x%x",
-                    resp.resp, resp.respex);
-        }
-}
-
-#include "spec/codec.h"
+        while (count > 0) {
+                wp = hda_get_rirbwp(hda);
+                ddf_msg(LVL_NOTE, "hda_rirb_read: wp=%d", wp);
+                while (count > 0 && hda->ctl->rirb_rp != wp) {
+                        ++hda->ctl->rirb_rp;
+                        resp = rirb[hda->ctl->rirb_rp];
+
+                        ddf_msg(LVL_NOTE, "RESPONSE resp=0x%x respex=0x%x",
+                            resp.resp, resp.respex);
+                        if ((resp.respex & BIT_V(uint32_t, respex_unsol)) == 0) {
+                                /* Solicited response */
+                                *data++ = resp;
+                                --count;
+                        }
+                }
+
+                if (count > 0) {
+                        wcnt = rirb_wait_max;
+                        while (wcnt > 0 && hda_get_rirbwp(hda) == hda->ctl->rirb_rp) {
+                                async_usleep(100);
+                                --wcnt;
+                        }
+
+                        if (hda_get_rirbwp(hda) == hda->ctl->rirb_rp)
+                                return ETIMEOUT;
+                }
+        }
+
+        return EOK;
+}
+
 hda_ctl_t *hda_ctl_init(hda_t *hda)
 {
@@ -426 +448 @@
                 goto error;
 
-        uint32_t verb;
-        verb = (0 << 28) | (0 << 20) | ((hda_get_param) << 8) | (hda_sub_nc);
-        rc = hda_corb_write(hda, &verb, 1);
-        ddf_msg(LVL_NOTE, "hda_corb_write -> %d", rc);
-        rc = hda_corb_write(hda, &verb, 1);
-        ddf_msg(LVL_NOTE, "hda_corb_write -> %d", rc);
-        rc = hda_corb_write(hda, &verb, 1);
-        ddf_msg(LVL_NOTE, "hda_corb_write -> %d", rc);
-        rc = hda_corb_write(hda, &verb, 1);
-        ddf_msg(LVL_NOTE, "hda_corb_write -> %d", rc);
-
-        async_usleep(100*1000);
-        hda_rirb_read(hda);
+        hda->ctl->codec = hda_codec_init(hda, 0);
+        if (hda->ctl->codec == NULL)
+                goto error;
 
         return ctl;
@@ -447 +459 @@
 }
 
+int hda_cmd(hda_t *hda, uint32_t verb, uint32_t *resp)
+{
+        int rc;
+        hda_rirb_entry_t rentry;
+
+        rc = hda_corb_write(hda, &verb, 1);
+        if (rc != EOK)
+                return rc;
+
+        if (resp != NULL) {
+                rc = hda_rirb_read(hda, &rentry, 1);
+                if (rc != EOK)
+                        return rc;
+
+                /* XXX Verify that response came from the correct codec */
+                *resp = rentry.resp;
+        }
+
+        return EOK;
+}
+
 void hda_ctl_fini(hda_ctl_t *ctl)
 {

uspace/drv/audio/hdaudio/hdactl.h

@@ -47 +47 @@
         size_t rirb_entries;
         size_t rirb_rp;
+
+        struct hda_codec *codec;
 } hda_ctl_t;
 
 extern hda_ctl_t *hda_ctl_init(hda_t *);
 extern void hda_ctl_fini(hda_ctl_t *);
+extern int hda_cmd(hda_t *, uint32_t, uint32_t *);
 
 #endif

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

@@ -105 +105 @@
         hda_sub_nc = 0x04,
         /** Function Group Type */
-        hba_fgrp_type = 0x05,
+        hda_fgrp_type = 0x05,
         /** Audio Function Group Capabilities */
         hda_afg_caps = 0x08,
@@ -132 +132 @@
 } hda_param_id_t;
 
+/** Subordinate Node Count Response bits */
+typedef enum {
+        /** Starting Node Number (H) */
+        subnc_startnode_h = 23,
+        /** Starting Node Number (L) */
+        subnc_startnode_l = 16,
+        /** Total Node Count (H) */
+        subnc_nodecount_h = 7,
+        /** Total Node Count (L) */
+        subnc_nodecount_l = 0
+} hda_sub_nc_bits_t;
+
+/** Function Group Type Response bits */
+typedef enum {
+        /** UnSol Capable */
+        fgrpt_unsol = 8,
+        /** Group Type (H) */
+        fgrpt_type_h = 7,
+        /** Group Type (L) */
+        fgrpt_type_l = 0
+} hda_fgrp_type_bits_t;
+
+/** Function Group Type */
+typedef enum {
+        /** Audio Function Group */
+        fgrp_afg = 0x01,
+        /** Vendor Defined Modem Function Group */
+        fgrp_vdmfg = 0x02
+} hda_fgrp_type_t;
+
+/** Audio Widget Capabilities Bits */
+typedef enum {
+        /** Type (H) */
+        awc_type_h = 23,
+        /** Type (L) */
+        awc_type_l = 20,
+        /** Chan Count Ext (H) */
+        awc_chan_count_ext_h = 15,
+        /** Chan Count Ext (L) */
+        awc_chan_count_ext_l = 13,
+        /** CP Caps */
+        awc_cp_caps = 12,
+        /** L-R Swap */
+        awc_lr_swap = 11,
+        /** Power Control */
+        awc_power_cntrl = 10,
+        /** Digital */
+        awc_digital = 9,
+        /** Conn List */
+        awc_conn_list = 8,
+        /** Unsol Capable */
+        awc_unsol_capable = 7,
+        /** Proc Widget */
+        awc_proc_widget = 6,
+        /** Stripe */
+        awc_stripe = 5,
+        /** Format Override */
+        awc_fmt_override = 4,
+        /** Amp Param Override */
+        awc_amp_param_override = 3,
+        /** Out Amp Present */
+        awc_out_amp_present = 2,
+        /** In Amp Present */
+        awc_in_amp_present = 1,
+        /** Chan Count LSB (Stereo) */
+        awc_chan_count_lsb = 0
+} hda_awidget_caps_bits_t;
+
+/** Audio Widget Type */
+typedef enum {
+        /** Audio Output */
+        awt_audio_output = 0x0,
+        /** Audio Input */
+        awt_audio_input = 0x1,
+        /** Audio Mixer */
+        awt_audio_mixer = 0x2,
+        /** Audio Selector */
+        awt_audio_selector = 0x3,
+        /** Pin Complex */
+        awt_pin_complex = 0x4,
+        /** Power Widget */
+        awt_power_widget = 0x5,
+        /** Volume Knob Widget */
+        awt_volume_knob = 0x6,
+        /** Beep Generator Widget */
+        awt_beep_generator = 0x7,
+        /** Vendor-defined audio widget */
+        awt_vendor_defined = 0xf
+} hda_awidget_type_t;
+
 #endif