Changeset 81906 in vbox

Timestamp:

Nov 17, 2019 3:04:56 PM (6 years ago)

Author:

vboxsync

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

134703

Message:

DevPit-i8254: Split up the state structure. bugref:9218

File:

• trunk/src/VBox/Devices/PC/DevPit-i8254.cpp (modified) (10 diffs)

trunk/src/VBox/Devices/PC/DevPit-i8254.cpp

@@ -214 +214 @@
 
 /**
- * The whole PIT state.
+ * The shared PIT state.
  */
 typedef struct PITSTATE
@@ -241 +241 @@
     int                     afAlignment2;
 #endif
-    /** PIT port interface. */
-    PDMIHPETLEGACYNOTIFY    IHpetLegacyNotify;
-    /** Pointer to the device instance. */
-    PPDMDEVINSR3            pDevIns;
     /** Number of IRQs that's been raised. */
     STAMCOUNTER             StatPITIrq;
@@ -256 +252 @@
     IOMIOPORTHANDLE         hIoPortSpeaker;
 } PITSTATE;
-/** Pointer to the PIT device state. */
+/** Pointer to the shared PIT device state. */
 typedef PITSTATE *PPITSTATE;
+
+
+/**
+ * The ring-3 PIT state.
+ */
+typedef struct PITSTATER3
+{
+    /** PIT port interface. */
+    PDMIHPETLEGACYNOTIFY    IHpetLegacyNotify;
+    /** Pointer to the device instance. */
+    PPDMDEVINSR3            pDevIns;
+} PITSTATER3;
+/** Pointer to the ring-3 PIT device state. */
+typedef PITSTATER3 *PPITSTATER3;
 
 
@@ -1228 +1238 @@
 static DECLCALLBACK(void) pitNotifyHpetLegacyNotify_ModeChanged(PPDMIHPETLEGACYNOTIFY pInterface, bool fActivated)
 {
-    PPITSTATE  pThis   = RT_FROM_MEMBER(pInterface, PITSTATE, IHpetLegacyNotify);
-    PPDMDEVINS pDevIns = pThis->pDevIns;
+    PPITSTATER3  pThisCC = RT_FROM_MEMBER(pInterface, PITSTATER3, IHpetLegacyNotify);
+    PPDMDEVINS   pDevIns = pThisCC->pDevIns;
+    PPITSTATE    pThis   = PDMDEVINS_2_DATA(pDevIns, PPITSTATE);
     PDMDevHlpCritSectEnter(pDevIns, &pThis->CritSect, VERR_IGNORED);
 
@@ -1246 +1257 @@
 {
     PPDMDEVINS  pDevIns = RT_FROM_MEMBER(pInterface, PDMDEVINS, IBase);
-    PPITSTATE   pThis   = PDMDEVINS_2_DATA(pDevIns, PPITSTATE);
+    PPITSTATER3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PPITSTATER3);
     PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE,    &pDevIns->IBase);
-    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHPETLEGACYNOTIFY, &pThis->IHpetLegacyNotify);
+    PDMIBASE_RETURN_INTERFACE(pszIID, PDMIHPETLEGACYNOTIFY, &pThisCC->IHpetLegacyNotify);
     return NULL;
 }
@@ -1299 +1310 @@
 {
     PDMDEV_CHECK_VERSIONS_RETURN(pDevIns);
-    PPITSTATE       pThis = PDMDEVINS_2_DATA(pDevIns, PPITSTATE);
-    PCPDMDEVHLPR3   pHlp  = pDevIns->pHlpR3;
+    PPITSTATE       pThis   = PDMDEVINS_2_DATA(pDevIns, PPITSTATE);
+    PPITSTATER3     pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PPITSTATER3);
+    PCPDMDEVHLPR3   pHlp    = pDevIns->pHlpR3;
     int             rc;
     uint8_t         u8Irq;
@@ -1340 +1352 @@
      * Init the data.
      */
-    pThis->pDevIns         = pDevIns;
     pThis->IOPortBaseCfg   = u16Base;
+    pThis->channels[0].irq = u8Irq;
+    for (i = 0; i < RT_ELEMENTS(pThis->channels); i++)
+    {
+        pThis->channels[i].hTimer = NIL_TMTIMERHANDLE;
+        pThis->channels[i].iChan  = i;
+    }
     pThis->fSpeakerCfg     = fSpeaker;
     pThis->enmSpeakerEmu   = PIT_SPEAKER_EMU_NONE;
@@ -1399 +1416 @@
         }
     }
-    pThis->channels[0].irq = u8Irq;
-    for (i = 0; i < RT_ELEMENTS(pThis->channels); i++)
-    {
-        pThis->channels[i].hTimer = NIL_TMTIMERHANDLE;
-        pThis->channels[i].iChan  = i;
-    }
 
     /*
@@ -1410 +1421 @@
      */
     /* IBase */
-    pDevIns->IBase.pfnQueryInterface        = pitQueryInterface;
+    pDevIns->IBase.pfnQueryInterface          = pitQueryInterface;
     /* IHpetLegacyNotify */
-    pThis->IHpetLegacyNotify.pfnModeChanged = pitNotifyHpetLegacyNotify_ModeChanged;
+    pThisCC->IHpetLegacyNotify.pfnModeChanged = pitNotifyHpetLegacyNotify_ModeChanged;
+    pThisCC->pDevIns                          = pDevIns;
 
     /*
@@ -1506 +1518 @@
     /* .uSharedVersion = */         42,
     /* .cbInstanceShared = */       sizeof(PITSTATE),
-    /* .cbInstanceCC = */           0,
+    /* .cbInstanceCC = */           CTX_EXPR(sizeof(PITSTATER3), 0, 0),
     /* .cbInstanceRC = */           0,
     /* .cMaxPciDevices = */         0,