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

Timestamp:

Jan 17, 2019 11:37:38 AM (6 years ago)

Author:

vboxsync

Message:

Audio/AC97: Condensed NABMBAR status register writes.

File:

• trunk/src/VBox/Devices/Audio/DevIchAc97.cpp (modified) (3 diffs)

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

@@ -833 +833 @@
 }
 
+static void ichac97StreamWriteSR(PAC97STATE pThis, PAC97STREAM pStream, uint32_t u32Val)
+{
+    PAC97BMREGS pRegs = &pStream->Regs;
+
+    Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8SD, u32Val));
+
+    pRegs->sr |= u32Val & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK);
+    ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32Val & AC97_SR_WCLEAR_MASK));
+}
+
 #ifdef IN_RING3
 
@@ -3226 +3236 @@
                 case MC_SR:
                 {
-                    AssertPtr(pStream);
-                    AssertPtr(pRegs);
-                    pRegs->sr |= u32Val & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK);
-                    ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32Val & AC97_SR_WCLEAR_MASK));
-                    Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8SD, u32Val, pRegs->sr));
+                    ichac97StreamWriteSR(pThis, pStream, u32Val);
                     break;
                 }
@@ -3248 +3254 @@
                 case PO_SR:
                 case MC_SR:
-                    AssertPtr(pStream);
-                    AssertPtr(pRegs);
-                    /* Status Register */
-                    pRegs->sr |= u32Val & ~(AC97_SR_RO_MASK | AC97_SR_WCLEAR_MASK);
-                    ichac97StreamUpdateSR(pThis, pStream, pRegs->sr & ~(u32Val & AC97_SR_WCLEAR_MASK));
-                    Log3Func(("[SD%RU8] SR <- %#x (sr %#x)\n", pStream->u8SD, u32Val, pRegs->sr));
+                    ichac97StreamWriteSR(pThis, pStream, u32Val);
                     break;
                 default: