Changeset 11195 in vbox for trunk/src/VBox/Devices/Input

Timestamp:

Aug 6, 2008 9:34:41 PM (17 years ago)

Author:

vboxsync

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

34228

Message:

DevPS2: cosmetics.

File:

• trunk/src/VBox/Devices/Input/DevPS2.cpp (modified) (18 diffs)

trunk/src/VBox/Devices/Input/DevPS2.cpp

@@ -1293 +1293 @@
     if (cb == 1)
     {
-        *pu32 = kbd_read_data(PDMINS2DATA(pDevIns, KBDState *), Port);
+        *pu32 = kbd_read_data(PDMINS_2_DATA(pDevIns, KBDState *), Port);
         Log2(("kbdIOPortDataRead: Port=%#x cb=%d *pu32=%#x\n", Port, cb, *pu32));
         return VINF_SUCCESS;
@@ -1318 +1318 @@
     if (cb == 1)
     {
-        rc = kbd_write_data(PDMINS2DATA(pDevIns, KBDState *), Port, u32);
+        rc = kbd_write_data(PDMINS_2_DATA(pDevIns, KBDState *), Port, u32);
         Log2(("kbdIOPortDataWrite: Port=%#x cb=%d u32=%#x\n", Port, cb, u32));
     }
@@ -1342 +1342 @@
     if (cb == 1)
     {
-        *pu32 = kbd_read_status(PDMINS2DATA(pDevIns, KBDState *), Port);
+        *pu32 = kbd_read_status(PDMINS_2_DATA(pDevIns, KBDState *), Port);
         Log2(("kbdIOPortStatusRead: Port=%#x cb=%d -> *pu32=%#x\n", Port, cb, *pu32));
         return VINF_SUCCESS;
@@ -1366 +1366 @@
     if (cb == 1)
     {
-        int rc = kbd_write_command(PDMINS2DATA(pDevIns, KBDState *), Port, u32);
+        int rc = kbd_write_command(PDMINS_2_DATA(pDevIns, KBDState *), Port, u32);
         Log2(("kbdIOPortCommandWrite: Port=%#x cb=%d u32=%#x rc=%Vrc\n", Port, cb, u32, rc));
         return rc;
@@ -1385 +1385 @@
 static DECLCALLBACK(int) kbdSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    kbd_save(pSSMHandle, PDMINS2DATA(pDevIns, KBDState *));
+    kbd_save(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *));
     return VINF_SUCCESS;
 }
@@ -1400 +1400 @@
 static DECLCALLBACK(int) kbdLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
-    return kbd_load(pSSMHandle, PDMINS2DATA(pDevIns, KBDState *), u32Version);
+    return kbd_load(pSSMHandle, PDMINS_2_DATA(pDevIns, KBDState *), u32Version);
 }
 
@@ -1411 +1411 @@
 static DECLCALLBACK(void)  kbdReset(PPDMDEVINS pDevIns)
 {
-    kbd_reset(PDMINS2DATA(pDevIns, KBDState *));
+    kbd_reset(PDMINS_2_DATA(pDevIns, KBDState *));
 }
 
@@ -1529 +1529 @@
 {
     int         rc;
-    KBDState   *pData = PDMINS2DATA(pDevIns, KBDState *);
+    KBDState   *pData = PDMINS_2_DATA(pDevIns, KBDState *);
     switch (iLUN)
     {
@@ -1535 +1535 @@
         case 0:
             rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pData->Keyboard.Base, &pData->Keyboard.pDrvBase, "Keyboard Port");
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 pData->Keyboard.pDrv = (PDMIKEYBOARDCONNECTOR*)(pData->Keyboard.pDrvBase->pfnQueryInterface(pData->Keyboard.pDrvBase, PDMINTERFACE_KEYBOARD_CONNECTOR));
@@ -1556 +1556 @@
         case 1:
             rc = PDMDevHlpDriverAttach(pDevIns, iLUN, &pData->Mouse.Base, &pData->Mouse.pDrvBase, "Aux (Mouse) Port");
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 pData->Mouse.pDrv = (PDMIMOUSECONNECTOR*)(pData->Mouse.pDrvBase->pfnQueryInterface(pData->Mouse.pDrvBase, PDMINTERFACE_MOUSE_CONNECTOR));
@@ -1603 +1603 @@
      * Reset the interfaces and update the controller state.
      */
-    KBDState   *pData = PDMINS2DATA(pDevIns, KBDState *);
+    KBDState   *pData = PDMINS_2_DATA(pDevIns, KBDState *);
     switch (iLUN)
     {
@@ -1630 +1630 @@
 static DECLCALLBACK(void) kdbRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    KBDState   *pData = PDMINS2DATA(pDevIns, KBDState *);
+    KBDState   *pData = PDMINS_2_DATA(pDevIns, KBDState *);
     pData->pDevInsRC = PDMDEVINS_2_RCPTR(pDevIns);
 }
@@ -1650 +1650 @@
 static DECLCALLBACK(int) kbdConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    KBDState   *pData = PDMINS2DATA(pDevIns, KBDState *);
+    KBDState   *pData = PDMINS_2_DATA(pDevIns, KBDState *);
     int         rc;
     bool        fGCEnabled;
@@ -1662 +1662 @@
         return VERR_PDM_DEVINS_UNKNOWN_CFG_VALUES;
     rc = CFGMR3QueryBoolDef(pCfgHandle, "GCEnabled", &fGCEnabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"GCEnabled\" from the config"));
     rc = CFGMR3QueryBoolDef(pCfgHandle, "R0Enabled", &fR0Enabled, true);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc, N_("Failed to query \"R0Enabled\" from the config"));
     Log(("pckbd: fGCEnabled=%RTbool fR0Enabled=%RTbool\n", fGCEnabled, fR0Enabled));
@@ -1686 +1686 @@
      */
     rc = PDMDevHlpIOPortRegister(pDevIns, 0x60, 1, NULL, kbdIOPortDataWrite,    kbdIOPortDataRead, NULL, NULL,   "PC Keyboard - Data");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = PDMDevHlpIOPortRegister(pDevIns, 0x64, 1, NULL, kbdIOPortCommandWrite, kbdIOPortStatusRead, NULL, NULL, "PC Keyboard - Command / Status");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (fGCEnabled)
     {
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x60, 1, 0, "kbdIOPortDataWrite",    "kbdIOPortDataRead", NULL, NULL,   "PC Keyboard - Data");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         rc = PDMDevHlpIOPortRegisterGC(pDevIns, 0x64, 1, 0, "kbdIOPortCommandWrite", "kbdIOPortStatusRead", NULL, NULL, "PC Keyboard - Command / Status");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1703 +1703 @@
     {
         rc = pDevIns->pDevHlp->pfnIOPortRegisterR0(pDevIns, 0x60, 1, 0, "kbdIOPortDataWrite",    "kbdIOPortDataRead", NULL, NULL,   "PC Keyboard - Data");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
         rc = pDevIns->pDevHlp->pfnIOPortRegisterR0(pDevIns, 0x64, 1, 0, "kbdIOPortCommandWrite", "kbdIOPortStatusRead", NULL, NULL, "PC Keyboard - Command / Status");
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return rc;
     }
@@ -1712 +1712 @@
                               NULL, kbdSaveExec, NULL,
                               NULL, kbdLoadExec, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1719 +1719 @@
      */
     rc = kbdAttach(pDevIns, 0 /* keyboard LUN # */);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = kbdAttach(pDevIns, 1 /* aux/mouse LUN # */);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;