Changeset 34005 in vbox for trunk/src/VBox/Devices/Audio

Timestamp:

Nov 11, 2010 6:34:27 PM (14 years ago)

Author:

vboxsync

Message:

HDA/Audio: typo.

File:

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

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

@@ -81 +81 @@
 /* Subordinate node count (7.3.4.3)*/
 #define CODEC_MAKE_F00_04(startNodeNumber, totalNodeNumber) ((((startNodeNumber) & 0xFF) << 16)|((totalNodeNumber) & 0xFF))
-/* 
+/*
  * Function Group Type  (7.3.4.4)
  * 0 & [0x3-0x7f] are reserved types
@@ -255 +255 @@
 /* HDA spec 7.3.3.31 defines layout of configuration registers/verbs (0xF1C) */
 /* Configuration's port connection */
-#define CODEC_F1C_PORT_MASK    (0x3) 
-#define CODEC_F1C_PORT_SHIFT   (30) 
-
-#define CODEC_F1C_PORT_COMPLEX (0x0) 
-#define CODEC_F1C_PORT_NO_PHYS (0x1) 
-#define CODEC_F1C_PORT_FIXED   (0x2) 
-#define CODEC_F1C_BOTH         (0x3) 
+#define CODEC_F1C_PORT_MASK    (0x3)
+#define CODEC_F1C_PORT_SHIFT   (30)
+
+#define CODEC_F1C_PORT_COMPLEX (0x0)
+#define CODEC_F1C_PORT_NO_PHYS (0x1)
+#define CODEC_F1C_PORT_FIXED   (0x2)
+#define CODEC_F1C_BOTH         (0x3)
 
 /* Configuration's location */
@@ -536 +536 @@
             pNode->port.u32F08_param = 0;
             if (!pState->fInReset)
-                pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX, 
-                                                          CODEC_F1C_LOCATION_FRONT, 
+                pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
+                                                          CODEC_F1C_LOCATION_FRONT,
                                                           CODEC_F1C_DEVICE_HP,
                                                           CODEC_F1C_CONNECTION_TYPE_1_8INCHES,
@@ -575 +575 @@
             if (!pState->fInReset)
                 pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
-                                                          CODEC_F1C_LOCATION_REAR, 
+                                                          CODEC_F1C_LOCATION_REAR,
                                                           CODEC_F1C_DEVICE_SPEAKER,
                                                           CODEC_F1C_CONNECTION_TYPE_1_8INCHES,
-                                                          CODEC_F1C_COLOR_GREEN, 
+                                                          CODEC_F1C_COLOR_GREEN,
                                                           0x0, 0x1, 0x0);//RT_MAKE_U32_FROM_U8(0x10, 0x40, 0x11, 0x01);
             goto port_init;
@@ -594 +594 @@
                 pNode->port.u32F1c_param = CODEC_MAKE_F1C(CODEC_F1C_PORT_COMPLEX,
                                                           CODEC_F1C_LOCATION_FRONT,
-                                                          CODEC_F1C_DEVICE_MIC, 
+                                                          CODEC_F1C_DEVICE_MIC,
                                                           CODEC_F1C_CONNECTION_TYPE_1_8INCHES,
                                                           CODEC_F1C_COLOR_PINK,
@@ -645 +645 @@
                                                           CODEC_F1C_LOCATION_REAR,
                                                           CODEC_F1C_DEVICE_SPEAKER,
-                                                          CODEC_F1C_CONNECTION_TYPE_1_8INCHES, 
+                                                          CODEC_F1C_CONNECTION_TYPE_1_8INCHES,
                                                           CODEC_F1C_COLOR_ORANGE,
                                                           0x0, 0x1, 0x2);//RT_MAKE_U32_FROM_U8(0x12, 0x60, 0x11, 0x01);
@@ -686 +686 @@
                                                            CODEC_F1C_DEVICE_SPDIF_IN,
                                                            CODEC_F1C_CONNECTION_TYPE_OTHER_DIGITAL,
-                                                           CODEC_F1C_COLOR_BLACK, 
+                                                           CODEC_F1C_COLOR_BLACK,
                                                            0x0, 0x6, 0x0);//(0x1 << 24) | (0xc5 << 16) | (0x10 << 8) | 0x60;
         break;
@@ -1816 +1816 @@
 {
     Assert(pu32F05_param);
-    if (pu32F05_param)
+    if (!pu32F05_param)
         return;
     bool fReset = CODEC_F05_IS_RESET(*pu32F05_param);
@@ -1852 +1852 @@
     if (!pu32Reg)
         return VINF_SUCCESS;
-    
+
     bool fReset = CODEC_F05_IS_RESET(*pu32Reg);
     bool fStopOk = CODEC_F05_IS_STOPOK(*pu32Reg);
@@ -1859 +1859 @@
     {
         /*
-         * We shouldn't propogate actual power state, which actual for AFG  
+         * We shouldn't propogate actual power state, which actual for AFG
          */
         *pu32Reg = CODEC_MAKE_F05(fReset, fStopOk, 0,
-                                  CODEC_F05_ACT(pState->pNodes[1].afg.u32F05_param), 
+                                  CODEC_F05_ACT(pState->pNodes[1].afg.u32F05_param),
                                   CODEC_F05_SET(cmd));
     }