Changeset 33787 in vbox

Timestamp:

Nov 4, 2010 8:36:36 PM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: VerbID(F00[0B/0D]) clarification and clean up.

File:

• trunk/src/VBox/Devices/Audio/DevCodec.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Audio/DevCodec.cpp

@@ -148 +148 @@
 #define CODEC_F00_0A_48KHZ_1_6X         RT_BIT(0)
 
+/* Supported streams formats (7.3.4.8) */
+#define CODEC_F00_0B_AC3                RT_BIT(2)
+#define CODEC_F00_0B_FLOAT32            RT_BIT(1)
+#define CODEC_F00_0B_PCM                RT_BIT(0)
+
 /* Pin Capabilities (7.3.4.9)*/
 #define CODEC_MAKE_F00_0C(vref_ctrl) (((vref_ctrl) & 0xFF) << 8)
@@ -161 +166 @@
 #define CODEC_F00_0C_CAP_TRIGGER_REQUIRED       RT_BIT(1)
 #define CODEC_F00_0C_CAP_IMPENDANCE_SENSE       RT_BIT(0)
+
+/* Amplifier capabilities (7.3.4.10) */
+#define MAKE_F00_0D(mute_cap, step_size, num_steps, offset) \
+           (((mute_cap) & 0x1) << 31)                       \
+        | (((step_size) & 0xFF) << 16)                      \
+        | (((num_steps) & 0xFF) << 8)                       \
+        | ((offset) & 0xFF)
 
 
@@ -343 +355 @@
                                              | CODEC_F00_0C_CAP_TRIGGER_REQUIRED
                                              | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//(17 << 8)|RT_BIT(6)|RT_BIT(5)|RT_BIT(2)|RT_BIT(1)|RT_BIT(0);
-            pNode->node.au32F00_param[0xB] = RT_BIT(0);
-            pNode->node.au32F00_param[0xD] = RT_BIT(31)|(0x5 << 16)|(0xE)<<8;
+            pNode->node.au32F00_param[0xB] = CODEC_F00_0B_PCM;
+            pNode->node.au32F00_param[0xD] = MAKE_F00_0D(1, 0x5, 0xE, 0);//RT_BIT(31)|(0x5 << 16)|(0xE)<<8;
             pNode->node.au32F00_param[0x12] = RT_BIT(31)|(0x2 << 16)|(0x7f << 8)|0x7f;
             pNode->node.au32F00_param[0x11] = 0xc0000004;
@@ -406 +418 @@
                                                     | CODEC_F00_09_CAP_LSB;//(4 << 16) | RT_BIT(9)|RT_BIT(4)|0x1;
             pNode->node.au32F00_param[0xa] = pState->pNodes[1].node.au32F00_param[0xA];
-            pNode->spdifout.node.au32F00_param[0xB] = RT_BIT(2)|RT_BIT(0);
+            pNode->spdifout.node.au32F00_param[0xB] = CODEC_F00_0B_PCM;
             pNode->spdifout.u32F06_param = 0;
             pNode->spdifout.u32F0d_param = 0;
@@ -421 +433 @@
             pNode->node.au32F00_param[0xE] = RT_BIT(0);
             pNode->node.au32F02_param[0] = 0x11;
-            pNode->spdifin.node.au32F00_param[0xB] = RT_BIT(2)|RT_BIT(0);
+            pNode->spdifin.node.au32F00_param[0xB] = CODEC_F00_0B_PCM;
             pNode->spdifin.u32F06_param = 0;
             pNode->spdifin.u32F0d_param = 0;
@@ -758 +770 @@
         case 0x1: /* AFG */
             pNode->afg.u32F20_param = pState->u16VendorId << 16 | pState->u16DeviceId;
-            pNode->node.au32F00_param[0xB] = 0x1;
+            pNode->node.au32F00_param[0xB] = CODEC_F00_0B_PCM;
             pNode->node.au32F00_param[0x11] = RT_BIT(30)|0x2;
             break;
@@ -779 +791 @@
             pNode->node.au32F00_param[0xA] = pState->pNodes[1].node.au32F00_param[0xA];
             pNode->node.au32F00_param[0x9] = 0x11;
-            pNode->node.au32F00_param[0xB] = 0x1;
+            pNode->node.au32F00_param[0xB] = CODEC_F00_0B_PCM;
             pNode->dac.u32A_param = (1<<14)|(0x1<<4) | 0x1;
             break;