[AC97] Addendum to 8467a4d

Author: Simone Lombardo

drivers/wdm/audio/drivers/ac97/ac97.inf

@@ -58,7 +58,7 @@ ExcludeFromSelect = *
 %ac97_GB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_27DE
 %ac97_6300ESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_25A6
 %ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_8086&DEV_2698
-%ac97_63xxESB.DeviceDesc%=ac97, PCI\VEN_10de&DEV_01b1
+%ac97_xbox.DeviceDesc%=ac97, PCI\VEN_10de&DEV_01b1
 
 ;; This section enables installing on x64 systems
 
@@ -353,6 +353,7 @@ ac97_FB.DeviceDesc="Intel 82801FB/FBM/FR/FW/FRW AC'97 Audio Controller"
 ac97_GB.DeviceDesc="Intel 82801GB/GR/GDH/GBM/GHM AC'97 Audio Controller"
 ac97_6300ESB.DeviceDesc="Intel 6300ESB AC'97 Audio Controller"
 ac97_63xxESB.DeviceDesc="Intel 631xESB/632xESB AC'97 Audio Controller"
+ac97_xbox.DeviceDesc="XBOX WM9709 AC'97 Audio Controller"
 ac97.DeviceDesc="Intel 82801 AC'97 Audio Controller"
 
 ac97.Wave.szPname="AC'97 Sound Card"

drivers/wdm/audio/drivers/ac97/common.cpp

@@ -65,13 +65,8 @@ tAC97Registers CAC97AdapterCommon::m_stAC97Registers[] =
 {0xBB80, SHREG_NOCACHE, NULL,               0},         // AC97REG_LFE_SAMPLERATE
 {0xBB80, SHREG_NOCACHE, NULL,               0},         // AC97REG_RECORD_SAMPLERATE
 {0xBB80, SHREG_NOCACHE, NULL,               0},         // AC97REG_MIC_SAMPLERATE
-#ifdef SARCH_XBOX
-{0x8080, SHREG_INVALID,    L"CenterLFEVolume", 0x0000},    // AC97REG_CENTER_LFE_VOLUME
-{0x8080, SHREG_INVALID,    L"SurroundVolume",  0x0000},    // AC97REG_SURROUND_VOLUME
-#else
 {0x8080, SHREG_INIT,    L"CenterLFEVolume", 0x0000},    // AC97REG_CENTER_LFE_VOLUME
 {0x8080, SHREG_INIT,    L"SurroundVolume",  0x0000},    // AC97REG_SURROUND_VOLUME
-#endif
 {0x0000, SHREG_NOCACHE, NULL,               0}          // AC97REG_RESERVED2
 
 // We leave the other values blank.  There would be a huge gap with 31
@@ -245,7 +240,7 @@ STDMETHODIMP_(NTSTATUS) CAC97AdapterCommon::Init
     //
     // Restore the AC97 registers now.
     //
-#if (DBG)
+#if (DBG) && !defined(SARCH_XBOX)
     DumpConfig ();
 #endif
     ntStatus = SetAC97Default ();
@@ -588,7 +583,9 @@ NTSTATUS CAC97AdapterCommon::InitAC97 (void)
         //
         WriteCodecRegister (AC97REG_RESET, 0x00, 0xFFFF);
 
+#ifdef SARCH_XBOX
         ntStatus = PowerUpCodec ();
+#endif
     }
     else
     {
@@ -684,23 +681,24 @@ NTSTATUS CAC97AdapterCommon::ProbeHWConfig (void)
         return ntStatus;
 
     //
-    // Master volume is one of the supported registers on an AC97
+    // This gives us information about the AC97 CoDec
     //
-    ntStatus = ReadCodecRegister (AC97REG_MASTER_VOLUME, &wCodecReg);
+    ntStatus = ReadCodecRegister (AC97REG_RESET, &wCodecID);
     if (!NT_SUCCESS (ntStatus))
         return ntStatus;
 
-    // Default is x8000.
-    if (wCodecReg != 0x8000)
-        return STATUS_NO_SUCH_DEVICE;
-
+ #ifndef SARCH_XBOX
     //
-    // This gives us information about the AC97 CoDec
+    // Master volume is one of the supported registers on an AC97
     //
-    ntStatus = ReadCodecRegister (AC97REG_RESET, &wCodecID);
-    if (!NT_SUCCESS (ntStatus))
+    ntStatus = ReadCodecRegister(AC97REG_MASTER_VOLUME, &wCodecReg);
+    if (!NT_SUCCESS(ntStatus))
         return ntStatus;
 
+    // Default is x8000.
+    if (wCodecReg != 0x8000)
+        return STATUS_NO_SUCH_DEVICE;
+
     //
     // Fill out the configuration stuff.
     //
@@ -1074,6 +1072,7 @@ NTSTATUS CAC97AdapterCommon::ProbeHWConfig (void)
 
     if (GetPinConfig (PINC_CENTER_LFE_PRESENT))
         Check6thBitSupport (AC97REG_CENTER_LFE_VOLUME, NODEC_6BIT_CENTER_LFE_VOLUME);
+#endif
 
     //
     // We read these registers because they are dependent on the codec.
@@ -1595,6 +1594,7 @@ STDMETHODIMP_(void) CAC97AdapterCommon::PowerChangeState
     DOUT (DBG_POWER, ("Changing state to D%d.", (ULONG)NewState.DeviceState -
                     (ULONG)PowerDeviceD0));
 
+#ifndef SARCH_XBOX
     //
     // Switch on new state.
     //
@@ -1695,6 +1695,7 @@ STDMETHODIMP_(void) CAC97AdapterCommon::PowerChangeState
     // cache property accesses and when to permit the driver from accessing
     // the hardware.
     //
+#endif
     m_PowerState = NewState.DeviceState;
     DOUT (DBG_POWER, ("Entering D%d", (ULONG)m_PowerState -
                       (ULONG)PowerDeviceD0));
@@ -1815,6 +1816,7 @@ NTSTATUS CAC97AdapterCommon::SetAC97Default (void)
                                       sizeof(WORD), PoolTag);
             if (NULL != KeyInfo)
             {
+#ifndef SARCH_XBOX
                 // loop through all mixer settings
                 for (AC97Register i = AC97REG_RESET; i <= AC97REG_RESERVED2;
                     i = (AC97Register)(i + 1))
@@ -1858,6 +1860,7 @@ NTSTATUS CAC97AdapterCommon::SetAC97Default (void)
                         }
                     }
                 }
+#endif
 
                 // we want to return status success even if the last QueryValueKey
                 // failed.
@@ -1880,6 +1883,7 @@ NTSTATUS CAC97AdapterCommon::SetAC97Default (void)
     }
 
 
+#ifndef SARCH_XBOX
     // in case we did not query the registry (cause of lack of resources)
     // restore default values and return insufficient resources.
     if (!NT_SUCCESS (ntStatus))
@@ -1894,6 +1898,7 @@ NTSTATUS CAC97AdapterCommon::SetAC97Default (void)
             }
         }
     }
+#endif
 
     return ntStatus;
 }
@@ -2100,6 +2105,7 @@ STDMETHODIMP_(void) CAC97AdapterCommon::ReadChannelConfigDefault
                                    sizeof(KEY_VALUE_PARTIAL_INFORMATION) +
                                         sizeof(DWORD),
                                    &ulResultLength );
+#ifndef SARCH_XBOX
                 if (NT_SUCCESS (ntStatus))
                 {
                     PKEY_VALUE_PARTIAL_INFORMATION PartialInfo =
@@ -2129,6 +2135,7 @@ STDMETHODIMP_(void) CAC97AdapterCommon::ReadChannelConfigDefault
                         }
                     }
                 }
+#endif
 
                 // free the key info
                 ExFreePoolWithTag (KeyInfo,PoolTag);

drivers/wdm/audio/drivers/ac97/stream.cpp

@@ -429,6 +429,7 @@ STDMETHODIMP_(NTSTATUS) CMiniportStream::SetFormat
         Miniport->AdapterCommon->WriteBMControlRegister (GLOB_CNT, dwControlReg);
     }
 
+    #ifndef SARCH_XBOX
     //
     // Check for rate support by hardware.  If it is supported, then update
     // hardware registers else return not implemented and audio stack will
@@ -467,6 +468,7 @@ STDMETHODIMP_(NTSTATUS) CMiniportStream::SetFormat
                 ProgramSampleRate (AC97REG_LFE_SAMPLERATE, TempRate);
         }
     }
+    #endif
 
     if (NT_SUCCESS (ntStatus))
     {