Changeset 34818 in vbox for trunk/src/VBox

Timestamp:

Dec 8, 2010 6:35:19 AM (14 years ago)

Author:

vboxsync

Message:

Audio/HDA: Implementation of WALCLK register. fixes with Ubuntu 10.10 issue.

File:

• trunk/src/VBox/Devices/Audio/DevIchIntelHDA.cpp (modified) (5 diffs)

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

@@ -433 +433 @@
     CODECState  Codec;
     uint8_t     u8Counter;
+    uint64_t    u64BaseTS;
 } INTELHDLinkState, *PINTELHDLinkState;
 
@@ -461 +462 @@
 DECLCALLBACK(int)hdaRegReadGCAP(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value);
 DECLCALLBACK(int)hdaRegReadINTSTS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value);
+DECLCALLBACK(int)hdaRegReadWALCLK(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value);
 DECLCALLBACK(int)hdaRegWriteINTSTS(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t pu32Value);
 DECLCALLBACK(int)hdaRegWriteCORBWP(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t pu32Value);
@@ -530 +532 @@
     { 0x00020, 0x00004, 0xC00000FF, 0xC00000FF, hdaRegReadU32          , hdaRegWriteU32          , "INTCTL"    , "Interrupt Control" },
     { 0x00024, 0x00004, 0xC00000FF, 0x00000000, hdaRegReadINTSTS       , hdaRegWriteUnimplemented, "INTSTS"    , "Interrupt Status" },
-    //** @todo r=michaln: Are guests really not reading the WALCLK register at all?
-    { 0x00030, 0x00004, 0xFFFFFFFF, 0x00000000, hdaRegReadUnimplemented, hdaRegWriteUnimplemented, "WALCLK"    , "Wall Clock Counter" },
+    { 0x00030, 0x00004, 0xFFFFFFFF, 0x00000000, hdaRegReadWALCLK, hdaRegWriteUnimplemented, "WALCLK"    , "Wall Clock Counter" },
     //** @todo r=michaln: Doesn't the SSYNC register need to actually stop the stream(s)?
     { 0x00034, 0x00004, 0x000000FF, 0x000000FF, hdaRegReadU32          , hdaRegWriteU32          , "SSYNC"     , "Stream Synchronization" },
@@ -996 +997 @@
     v |= v ? RT_BIT(31) : 0;
     *pu32Value = v;
+    return VINF_SUCCESS;
+}
+
+DECLCALLBACK(int)hdaRegReadWALCLK(INTELHDLinkState* pState, uint32_t offset, uint32_t index, uint32_t *pu32Value)
+{
+    *pu32Value = (uint32_t)((RTTimeNanoTS() - pState->u64BaseTS) * 24) / 100;
     return VINF_SUCCESS;
 }
@@ -1939 +1946 @@
     else
         pThis->hda.pu64RirbBuf = (uint64_t *)RTMemAllocZ(pThis->hda.cbRirbBuf);
+
+    pThis->hda.u64BaseTS = RTTimeNanoTS();
 
 #if 0