Changeset 149dd52d in mainline for uspace/drv/audio/hdaudio/codec.c

Timestamp:

2014-08-27T15:52:16Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3fec817

Parents:

a9be4d2

Message:

Fix 64-bit issues.

File:

• uspace/drv/audio/hdaudio/codec.c (modified) (5 diffs)

uspace/drv/audio/hdaudio/codec.c

@@ -67 +67 @@
         int rc = hda_cmd(codec->hda, verb, resp);
 
-        if (resp != NULL) {
+/*      if (resp != NULL) {
                 ddf_msg(LVL_NOTE, "verb 0x%" PRIx32 " -> 0x%" PRIx32, verb,
                     *resp);
@@ -73 +73 @@
                 ddf_msg(LVL_NOTE, "verb 0x%" PRIx32, verb);
         }
-
+*/
         return rc;
 }
@@ -250 +250 @@
             ampcaps, offset);
 
-        rc = hda_set_amp_gain_mute(codec, aw, 0xb000 + offset/2);
+        rc = hda_set_amp_gain_mute(codec, aw, 0xb000 + offset);
         if (rc != EOK)
                 goto error;
@@ -286 +286 @@
 
         for (i = 0; i < 15; i++) {
-                rc = hda_set_amp_gain_mute(codec, aw, 0x7000 + (i << 8) + offset/2);
+                rc = hda_set_amp_gain_mute(codec, aw, 0x7000 + (i << 8) + offset);
                 if (rc != EOK)
                         goto error;
@@ -466 +466 @@
                 ddf_msg(LVL_NOTE, "hda_get_fgrp_type -> %d", rc);
                 ddf_msg(LVL_NOTE, "unsol: %d, grptype: %d", unsol, grptype);
+
+                rc = hda_power_ctl_init(codec, fg);
+                if (rc != EOK)
+                        goto error;
 
                 rc = hda_get_subnc(codec, fg, &saw, &naw);