Changeset 11210 in vbox for trunk/src/VBox

Timestamp:

Aug 7, 2008 4:00:05 PM (17 years ago)

Author:

vboxsync

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

34256

Message:

DevRTC: cosmetics.

File:

• trunk/src/VBox/Devices/PC/DevRTC.cpp (modified) (24 diffs)

trunk/src/VBox/Devices/PC/DevRTC.cpp

@@ -481 +481 @@
 #endif /* IN_RING3 */
 
-/* -=-=-=-=-=- wrappers -=-=-=-=-=- */
+/* -=-=-=-=-=- wrappers / stuff -=-=-=-=-=- */
 
 /**
@@ -499 +499 @@
     if (cb == 1)
     {
-        *pu32 = cmos_ioport_read(PDMINS2DATA(pDevIns, RTCState *), Port);
+        *pu32 = cmos_ioport_read(PDMINS_2_DATA(pDevIns, RTCState *), Port);
         return VINF_SUCCESS;
     }
@@ -521 +521 @@
     NOREF(pvUser);
     if (cb == 1)
-        cmos_ioport_write(PDMINS2DATA(pDevIns, RTCState *), Port, u32);
+        cmos_ioport_write(PDMINS_2_DATA(pDevIns, RTCState *), Port, u32);
     return VINF_SUCCESS;
 }
@@ -534 +534 @@
 PDMBOTHCBDECL(void) rtcTimerPeriodic(PPDMDEVINS pDevIns, PTMTIMER pTimer)
 {
-    rtc_periodic_timer(PDMINS2DATA(pDevIns, RTCState *));
+    rtc_periodic_timer(PDMINS_2_DATA(pDevIns, RTCState *));
 }
 
@@ -546 +546 @@
 PDMBOTHCBDECL(void) rtcTimerSecond(PPDMDEVINS pDevIns, PTMTIMER pTimer)
 {
-    rtc_update_second(PDMINS2DATA(pDevIns, RTCState *));
+    rtc_update_second(PDMINS_2_DATA(pDevIns, RTCState *));
 }
 
@@ -558 +558 @@
 PDMBOTHCBDECL(void) rtcTimerSecond2(PPDMDEVINS pDevIns, PTMTIMER pTimer)
 {
-    rtc_update_second2(PDMINS2DATA(pDevIns, RTCState *));
+    rtc_update_second2(PDMINS_2_DATA(pDevIns, RTCState *));
 }
 
@@ -572 +572 @@
 static DECLCALLBACK(int) rtcSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    RTCState *pThis = PDMINS2DATA(pDevIns, RTCState *);
+    RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
 
     SSMR3PutMem(pSSMHandle, pThis->cmos_data, 128);
@@ -607 +607 @@
 static DECLCALLBACK(int) rtcLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
-    RTCState *pThis = PDMINS2DATA(pDevIns, RTCState *);
+    RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
 
     if (u32Version != 1)
@@ -677 +677 @@
 static DECLCALLBACK(int) rtcCMOSWrite(PPDMDEVINS pDevIns, unsigned iReg, uint8_t u8Value)
 {
-    RTCState *pData = PDMINS2DATA(pDevIns, RTCState *);
-    if (iReg < ELEMENTS(pData->cmos_data))
+    RTCState *pData = PDMINS_2_DATA(pDevIns, RTCState *);
+    if (iReg < RT_ELEMENTS(pData->cmos_data))
     {
         pData->cmos_data[iReg] = u8Value;
@@ -704 +704 @@
 static DECLCALLBACK(int) rtcCMOSRead(PPDMDEVINS pDevIns, unsigned iReg, uint8_t *pu8Value)
 {
-    RTCState   *pData = PDMINS2DATA(pDevIns, RTCState *);
-    if (iReg < ELEMENTS(pData->cmos_data))
+    RTCState   *pData = PDMINS_2_DATA(pDevIns, RTCState *);
+    if (iReg < RT_ELEMENTS(pData->cmos_data))
     {
         *pu8Value = pData->cmos_data[iReg];
@@ -721 +721 @@
 {
     /** @todo this should be (re)done at power on if we didn't load a state... */
-    RTCState   *pData = PDMINS2DATA(pDevIns, RTCState *);
+    RTCState   *pData = PDMINS_2_DATA(pDevIns, RTCState *);
 
     /*
@@ -768 +768 @@
 static DECLCALLBACK(void) rtcRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    RTCState *pThis = PDMINS2DATA(pDevIns, RTCState *);
+    RTCState *pThis = PDMINS_2_DATA(pDevIns, RTCState *);
 
     pThis->pDevInsGC = PDMDEVINS_2_GCPTR(pDevIns);
@@ -792 +792 @@
 static DECLCALLBACK(int)  rtcConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    RTCState   *pData = PDMINS2DATA(pDevIns, RTCState *);
+    RTCState   *pData = PDMINS_2_DATA(pDevIns, RTCState *);
     int         rc;
     uint8_t     u8Irq;
@@ -812 +812 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         u8Irq = 8;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"Irq\" as a uint8_t failed"));
@@ -819 +819 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         u16Base = 0x70;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"Base\" as a uint16_t failed"));
@@ -826 +826 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fGCEnabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: failed to read GCEnabled as boolean"));
@@ -833 +833 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         fR0Enabled = true;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: failed to read R0Enabled as boolean"));
@@ -854 +854 @@
      */
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, rtcTimerPeriodic, "MC146818 RTC/CMOS - Periodic", &pData->pPeriodicTimerHC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
@@ -860 +860 @@
     }
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, rtcTimerSecond, "MC146818 RTC/CMOS - Second", &pData->pSecondTimerHC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
@@ -866 +866 @@
     }
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL_SYNC, rtcTimerSecond2, "MC146818 RTC/CMOS - Second2", &pData->pSecondTimer2HC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("pfnTMTimerCreate -> %Vrc\n", rc));
@@ -875 +875 @@
 
     rc = PDMDevHlpIOPortRegister(pDevIns, u16Base, 2, NULL, rtcIOPortWrite, rtcIOPortRead, NULL, NULL, "MC146818 RTC/CMOS");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (fGCEnabled)
     {
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, u16Base, 2, 0, "rtcIOPortWrite", "rtcIOPortRead", NULL, NULL, "MC146818 RTC/CMOS");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -886 +886 @@
     {
         rc = PDMDevHlpIOPortRegisterR0(pDevIns, u16Base, 2, 0, "rtcIOPortWrite", "rtcIOPortRead", NULL, NULL, "MC146818 RTC/CMOS");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -893 +893 @@
                               NULL, rtcSaveExec, NULL,
                               NULL, rtcLoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -900 +900 @@
      */
     rc = pDevIns->pDevHlp->pfnRTCRegister(pDevIns, &pData->RtcReg, &pData->pRtcHlpHC);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;