Changeset 34591 in vbox

Timestamp:

Dec 2, 2010 4:30:29 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: some cosmetic. tune port F params.

File:

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

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

@@ -214 +214 @@
 #define CODEC_F05_ACT(value)        (((value) & 0x7) >> 4)
 #define CODEC_F05_SET(value)        (((value) & 0x7))
+
+/* Pin Widged Control (7.3.3.13) */
+#define CODEC_F07_VREF_HIZ      (0)
+#define CODEC_F07_VREF_50       (0x1)
+#define CODEC_F07_VREF_GROUND   (0x2)
+#define CODEC_F07_VREF_80       (0x4)
+#define CODEC_F07_VREF_100      (0x5)
+#define CODEC_F07_IN_ENABLE     RT_BIT(5)
+#define CODEC_F07_OUT_ENABLE    RT_BIT(6)
+#define CODEC_F07_OUT_H_ENABLE  RT_BIT(7)
 
 /* Converter formats (7.3.3.8) and (3.7.1) */
@@ -511 +521 @@
             pNode->node.name = "Reserved_0";
             pNode->spdifin.u32A_param = CODEC_MAKE_A(0, 1, CODEC_A_MULT_1X, CODEC_A_DIV_1X, CODEC_A_16_BIT, 1);//(0x1<<4) | 0x1;
-            pNode->spdifin.u32F09_param = CODEC_MAKE_F09_ANALOG(0, CODEC_F09_ANALOG_NA);//RT_BIT(31)|0x7fffffff;
             pNode->spdifin.node.au32F00_param[9] =   CODEC_MAKE_F00_09(CODEC_F00_09_TYPE_AUDIO_INPUT, 0x4, 0)
                                                    | CODEC_F00_09_CAP_DIGITAL
@@ -534 +543 @@
                                              | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//0x173f;
             pNode->node.au32F02_param[0] = 0x2;
-            pNode->port.u32F07_param = 0xc0;//RT_BIT(6);
+            pNode->port.u32F07_param =   CODEC_F07_IN_ENABLE
+                                       | CODEC_F07_OUT_ENABLE;
             pNode->port.u32F08_param = 0;
             if (!pState->fInReset)
@@ -554 +564 @@
                                              | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//0x1737;
             pNode->node.au32F02_param[0] = 0x4;
-            pNode->port.u32F07_param = RT_BIT(5);
+            pNode->port.u32F07_param = CODEC_F07_IN_ENABLE;
             if (!pState->fInReset)
                 pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
@@ -573 +583 @@
                                              | CODEC_F00_0C_CAP_TRIGGER_REQUIRED
                                              | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//0x1737;
-            pNode->port.u32F07_param = RT_BIT(5);
+            pNode->port.u32F07_param = CODEC_F07_IN_ENABLE;
             if (!pState->fInReset)
                 pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
@@ -590 +600 @@
                                              | CODEC_F00_0C_CAP_TRIGGER_REQUIRED
                                              | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//0x1737;
-            pNode->port.u32F07_param = RT_BIT(5);
+            pNode->port.u32F07_param = CODEC_F07_IN_ENABLE;
             pNode->node.au32F02_param[0] = 0x2;
             if (!pState->fInReset)
@@ -617 +627 @@
                                              | CODEC_F00_0C_CAP_OUTPUT
                                              | CODEC_F00_0C_CAP_PRESENSE_DETECT;//0x34;
-            pNode->port.u32F07_param = RT_BIT(5);
+            pNode->port.u32F07_param = CODEC_F07_IN_ENABLE;
             pNode->port.u32F09_param = CODEC_MAKE_F09_ANALOG(0, CODEC_F09_ANALOG_NA);//0x7fffffff;
             if (!pState->fInReset)
@@ -637 +647 @@
                                              | CODEC_F00_0C_CAP_OUTPUT
                                              | CODEC_F00_0C_CAP_PRESENSE_DETECT
-                                             | CODEC_F00_0C_CAP_TRIGGER_REQUIRED
-                                             | CODEC_F00_0C_CAP_IMPENDANCE_SENSE;//0x37;
+                                             /* | CODEC_F00_0C_CAP_TRIGGER_REQUIRED
+                                             | CODEC_F00_0C_CAP_IMPENDANCE_SENSE */;//0x37;
             pNode->node.au32F00_param[0xE] = CODEC_MAKE_F00_0E(0, 1);//0x1;
             pNode->port.u32F08_param = 0;
-            pNode->port.u32F07_param = 0x40;
+            pNode->port.u32F07_param =   CODEC_F07_OUT_ENABLE
+                                         | CODEC_F07_IN_ENABLE;
             if (!pState->fInReset)
                 pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
-                                                          CODEC_F1C_LOCATION_REAR,
+                                                          CODEC_F1C_LOCATION_INTERNAL,
                                                           CODEC_F1C_DEVICE_SPEAKER,
                                                           CODEC_F1C_CONNECTION_TYPE_1_8INCHES,
@@ -660 +671 @@
             pNode->node.au32F00_param[0xC] = CODEC_F00_0C_CAP_OUTPUT;//RT_BIT(4);
             pNode->node.au32F00_param[0xE] = CODEC_MAKE_F00_0E(0, 0x3);
-            pNode->digout.u32F01_param = 0;
             pNode->node.au32F02_param[0] = RT_MAKE_U32_FROM_U8(0x08, 0x17, 0x19, 0);
-            pNode->digout.u32F07_param = 0;
             if (!pState->fInReset)
                 pNode->digout.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
@@ -724 +733 @@
                                              | CODEC_F00_09_CAP_LSB;//(4 << 20)|RT_BIT(0);
             pNode->node.au32F00_param[0xc] = CODEC_F00_0C_CAP_INPUT;//RT_BIT(5);
-            pNode->cdnode.u32F07_param = 0;
             if (!pState->fInReset)
                 pNode->cdnode.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_FIXED,
@@ -783 +791 @@
             pNode->node.au32F00_param[0xC] = CODEC_F00_0C_CAP_OUTPUT;//0x10;
             pNode->node.au32F02_param[0] = 0x1a;
-            pNode->reserved.u32F07_param = 0;
             pNode->reserved.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_NO_PHYS,
                                                           CODEC_F1C_LOCATION_NA,