Changeset 11252 in vbox for trunk/src/VBox/Devices

Timestamp:

Aug 8, 2008 2:09:19 PM (16 years ago)

Author:

vboxsync

Message:

DevPit-i8254: Cosmetics.

File:

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

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

@@ -446 +446 @@
     }
 
-    PITState *pit = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pit = PDMINS_2_DATA(pDevIns, PITState *);
     int ret;
     PITChannelState *s = &pit->channels[Port];
@@ -524 +524 @@
         return VINF_SUCCESS;
 
-    PITState *pit = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pit = PDMINS_2_DATA(pDevIns, PITState *);
     Port &= 3;
     if (Port == 3)
@@ -551 +551 @@
         {
             /* read-back command */
-            for (channel = 0; channel < ELEMENTS(pit->channels); channel++)
+            for (channel = 0; channel < RT_ELEMENTS(pit->channels); channel++)
             {
                 PITChannelState *s = &pit->channels[channel];
@@ -638 +638 @@
     if (cb == 1)
     {
-        PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+        PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
         const uint64_t u64Now = TMTimerGet(pData->channels[0].CTX_SUFF(pTimer));
         Assert(TMTimerGetFreq(pData->channels[0].CTX_SUFF(pTimer)) == 1000000000); /* lazy bird. */
@@ -687 +687 @@
     if (cb == 1)
     {
-        PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+        PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
         pData->speaker_data_on = (u32 >> 1) & 1;
         pit_set_gate(pData, 2, u32 & 1);
@@ -705 +705 @@
 static DECLCALLBACK(int) pitSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
     unsigned i;
 
-    for (i = 0; i < ELEMENTS(pData->channels); i++)
+    for (i = 0; i < RT_ELEMENTS(pData->channels); i++)
     {
         PITChannelState *s = &pData->channels[i];
@@ -750 +750 @@
 static DECLCALLBACK(int) pitLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
-    PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
     unsigned i;
 
@@ -756 +756 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
 
-    for (i = 0; i < ELEMENTS(pData->channels); i++)
+    for (i = 0; i < RT_ELEMENTS(pData->channels); i++)
     {
         PITChannelState *s = &pData->channels[i];
@@ -802 +802 @@
 static DECLCALLBACK(void) pitTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer)
 {
-    PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
     PITChannelState *s = &pData->channels[0];
     STAM_PROFILE_ADV_START(&s->CTX_SUFF(pPit)->StatPITHandler, a);
@@ -819 +819 @@
 static DECLCALLBACK(void) pitRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
     unsigned i;
     LogFlow(("pitRelocate: \n"));
@@ -843 +843 @@
 static DECLCALLBACK(void) pitReset(PPDMDEVINS pDevIns)
 {
-    PITState *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState *pData = PDMINS_2_DATA(pDevIns, PITState *);
     unsigned i;
     LogFlow(("pitReset: \n"));
 
-    for (i = 0; i < ELEMENTS(pData->channels); i++)
+    for (i = 0; i < RT_ELEMENTS(pData->channels); i++)
     {
         PITChannelState *s = &pData->channels[i];
@@ -879 +879 @@
 static DECLCALLBACK(void) pitInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    PITState   *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState   *pData = PDMINS_2_DATA(pDevIns, PITState *);
     unsigned    i;
-    for (i = 0; i < ELEMENTS(pData->channels); i++)
+    for (i = 0; i < RT_ELEMENTS(pData->channels); i++)
     {
         const PITChannelState *pCh = &pData->channels[i];
@@ -926 +926 @@
 static DECLCALLBACK(int)  pitConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    PITState   *pData = PDMINS2DATA(pDevIns, PITState *);
+    PITState   *pData = PDMINS_2_DATA(pDevIns, PITState *);
     int         rc;
     uint8_t     u8Irq;
@@ -946 +946 @@
      */
     rc = CFGMR3QueryU8Def(pCfgHandle, "Irq", &u8Irq, 0);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"Irq\" as a uint8_t failed"));
 
     rc = CFGMR3QueryU16Def(pCfgHandle, "Base", &u16Base, 0x40);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"Base\" as a uint16_t failed"));
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "SpeakerEnabled", &fSpeaker, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"SpeakerEnabled\" as a bool failed"));
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"GCEnabled\" as a bool failed"));
 
     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: failed to read R0Enabled as boolean"));
@@ -984 +984 @@
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, pitTimer, "i8254 Programmable Interval Timer",
                                 &pData->channels[0].pTimerR3);
-    if (VBOX_FAILURE(rc))
-    {
-        AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
+    if (RT_FAILURE(rc))
         return rc;
-    }
     pData->channels[0].pTimerRC = TMTimerRCPtr(pData->channels[0].pTimerR3);
     pData->channels[0].pTimerR0 = TMTimerR0Ptr(pData->channels[0].pTimerR3);
 
     rc = PDMDevHlpIOPortRegister(pDevIns, u16Base, 4, NULL, pitIOPortWrite, pitIOPortRead, NULL, NULL, "i8254 Programmable Interval Timer");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (fGCEnabled)
     {
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, u16Base, 4, 0, "pitIOPortWrite", "pitIOPortRead", NULL, NULL, "i8254 Programmable Interval Timer");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1004 +1001 @@
     {
         rc = PDMDevHlpIOPortRegisterR0(pDevIns, u16Base, 4, 0, "pitIOPortWrite", "pitIOPortRead", NULL, NULL, "i8254 Programmable Interval Timer");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1011 +1008 @@
     {
         rc = PDMDevHlpIOPortRegister(pDevIns, 0x61, 1, NULL, pitIOPortSpeakerWrite, pitIOPortSpeakerRead, NULL, NULL, "PC Speaker");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         if (fGCEnabled)
         {
             rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x61, 1, 0, NULL, "pitIOPortSpeakerRead", NULL, NULL, "PC Speaker");
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
         }
@@ -1024 +1021 @@
                                           NULL, pitSaveExec, NULL,
                                           NULL, pitLoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;