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

Timestamp:

Nov 2, 2010 9:48:24 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

67299

Message:

scm cleanup run.

Location:

trunk/src/VBox/Devices/Audio

Files:

• DevCodec.cpp (modified) (5 diffs)
• DevCodec.h (modified) (1 diff)
• DevIchAc97.cpp (modified) (1 diff)

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

@@ -432 +432 @@
             pNode->node.au32F00_param[4] = (1 << 16)|0x1; /* start node 1, total 1*/
             pNode->node.au32F00_param[0xA] = pState->pNodes[1].node.au32F00_param[0xA];
-            
+
             break;
         case 0x1: /* AFG */
             pNode->node.au32F00_param[4] = (2 << 16)|0x25; /* start node 1, total 1*/
-            pNode->node.au32F00_param[5] = RT_BIT(8) | 0x1; /* UnSol: enabled, function group type: AFG */ 
+            pNode->node.au32F00_param[5] = RT_BIT(8) | 0x1; /* UnSol: enabled, function group type: AFG */
             pNode->afg.u32F20_param = pState->u16VendorId << 16 | pState->u16DeviceId;
             pNode->node.au32F00_param[0xB] = 0x1;
@@ -601 +601 @@
             pNode->port.u32F1c_param = 0x400000f0;
             pNode->node.au32F00_param[0xC] = RT_BIT(13)|RT_BIT(12)|RT_BIT(11)|RT_BIT(10)|RT_BIT(9)|RT_BIT(8)|RT_BIT(5)|RT_BIT(4)|RT_BIT(3)|RT_BIT(2);
-        port_init:    
+        port_init:
             pNode->node.au32F00_param[0x9] = 0x40018f;
             pNode->node.au32F00_param[0xD] = 0x270300;
@@ -1910 +1910 @@
 
     /* 44.1 kHz */
-    as.freq = 44100; 
+    as.freq = 44100;
     as.nchannels = 2;
     as.fmt = AUD_FMT_S16;
@@ -1927 +1927 @@
     #define IS_FORMAT_SUPPORTED_BY_HOST(pState, base, mult, div) (AUDIO_FORMAT_SELECTOR((pState), Out, (base), (mult), (div)) \
         && AUDIO_FORMAT_SELECTOR((pState), In, (base), (mult), (div)))
-    
+
     pState->pNodes[1].node.au32F00_param[0xA] = RT_BIT(17); /* 16-bit samples */
     SETUP_AUDIO_FORMAT(pState, AFMT_HZ_44_1K, AFMT_MULT_X1, AFMT_DIV_X1, "hda44_1", as, pi_callback, po_callback);
@@ -1941 +1941 @@
     pState->pNodes[1].node.au32F00_param[0xA] |= IS_FORMAT_SUPPORTED_BY_HOST(pState, AFMT_HZ_44_1K, AFMT_MULT_X4, AFMT_DIV_X1) ? RT_BIT(9) : 0;
 
-    as.freq = 48000; 
+    as.freq = 48000;
     SETUP_AUDIO_FORMAT(pState, AFMT_HZ_48K, AFMT_MULT_X1, AFMT_DIV_X1, "hda48", as, pi_callback, po_callback);
     pState->pNodes[1].node.au32F00_param[0xA] |= IS_FORMAT_SUPPORTED_BY_HOST(pState, AFMT_HZ_48K, AFMT_MULT_X1, AFMT_DIV_X1) ? RT_BIT(6) : 0;

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

@@ -241 +241 @@
 
 #ifdef VBOX_WITH_AUDIO_FLEXIBLE_FORMAT
-# define MAX_AUDIO_FORMAT 64 
+# define MAX_AUDIO_FORMAT 64
 typedef SWVoiceIn *CODECAUDIOINFORMAT[MAX_AUDIO_FORMAT];
 typedef SWVoiceOut *CODECAUDIOOUTFORMAT[MAX_AUDIO_FORMAT];

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

@@ -1579 +1579 @@
     PCIDevSetDeviceId           (&pThis->dev, 0x2415); /* 02 ro - 82801 / 82801aa(?). */Assert (pThis->dev.config[0x02] == 0x15); Assert (pThis->dev.config[0x03] == 0x24);
     PCIDevSetCommand            (&pThis->dev, 0x0000); /* 04 rw,ro - pcicmd. */         Assert (pThis->dev.config[0x04] == 0x00); Assert (pThis->dev.config[0x05] == 0x00);
-    PCIDevSetStatus             (&pThis->dev, 
+    PCIDevSetStatus             (&pThis->dev,
            VBOX_PCI_STATUS_DEVSEL_MEDIUM |  VBOX_PCI_STATUS_FAST_BACK); /* 06 rwc?,ro? - pcists. */      Assert (pThis->dev.config[0x06] == 0x80); Assert (pThis->dev.config[0x07] == 0x02);
     PCIDevSetRevisionId         (&pThis->dev, 0x01);   /* 08 ro - rid. */               Assert (pThis->dev.config[0x08] == 0x01);