Changeset 58132 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Oct 9, 2015 12:09:37 AM (9 years ago)

Author:

vboxsync

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

103230

Message:

*: Doxygen fixes.

Location:

trunk/src/VBox/Devices/PC

Files:

• DevACPI.cpp (modified) (4 diffs)
• DevDMA.cpp (modified) (6 diffs)
• DevPIC.cpp (modified) (1 diff)

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

@@ -2011 +2011 @@
  * @callback_method_impl{FNSSMDEVSAVEEXEC}
  */
-static DECLCALLBACK(int) acpiR3SaveState(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
+static DECLCALLBACK(int) acpiR3SaveState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
-    return SSMR3PutStruct(pSSMHandle, pThis, &g_AcpiSavedStateFields7[0]);
+    return SSMR3PutStruct(pSSM, pThis, &g_AcpiSavedStateFields7[0]);
 }
 
@@ -2020 +2020 @@
  * @callback_method_impl{FNSSMDEVLOADEXEC}
  */
-static DECLCALLBACK(int) acpiR3LoadState(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
+static DECLCALLBACK(int) acpiR3LoadState(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     ACPIState *pThis = PDMINS_2_DATA(pDevIns, ACPIState *);
@@ -2036 +2036 @@
     {
         case 4:
-            rc = SSMR3GetStruct(pSSMHandle, pThis, &g_AcpiSavedStateFields4[0]);
+            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields4[0]);
             break;
         case 5:
-            rc = SSMR3GetStruct(pSSMHandle, pThis, &g_AcpiSavedStateFields5[0]);
+            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields5[0]);
             break;
         case 6:
-            rc = SSMR3GetStruct(pSSMHandle, pThis, &g_AcpiSavedStateFields6[0]);
+            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields6[0]);
             break;
         case 7:
-            rc = SSMR3GetStruct(pSSMHandle, pThis, &g_AcpiSavedStateFields7[0]);
+            rc = SSMR3GetStruct(pSSM, pThis, &g_AcpiSavedStateFields7[0]);
             break;
         default:
@@ -2998 +2998 @@
 
 /**
- * @interface_methid_impl{PDMDEVREG,pfnDestruct}
+ * @interface_method_impl{PDMDEVREG,pfnDestruct}
  */
 static DECLCALLBACK(int) acpiR3Destruct(PPDMDEVINS pDevIns)

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

@@ -827 +827 @@
 }
 
-static void dmaSaveController(PSSMHANDLE pSSMHandle, DMAControl *dc)
+static void dmaSaveController(PSSMHANDLE pSSM, DMAControl *dc)
 {
     int         chidx;
 
     /* Save controller state... */
-    SSMR3PutU8(pSSMHandle, dc->u8Command);
-    SSMR3PutU8(pSSMHandle, dc->u8Mask);
-    SSMR3PutU8(pSSMHandle, dc->fHiByte);
-    SSMR3PutU32(pSSMHandle, dc->is16bit);
-    SSMR3PutU8(pSSMHandle, dc->u8Status);
-    SSMR3PutU8(pSSMHandle, dc->u8Temp);
-    SSMR3PutU8(pSSMHandle, dc->u8ModeCtr);
-    SSMR3PutMem(pSSMHandle, &dc->au8Page, sizeof(dc->au8Page));
-    SSMR3PutMem(pSSMHandle, &dc->au8PageHi, sizeof(dc->au8PageHi));
+    SSMR3PutU8(pSSM, dc->u8Command);
+    SSMR3PutU8(pSSM, dc->u8Mask);
+    SSMR3PutU8(pSSM, dc->fHiByte);
+    SSMR3PutU32(pSSM, dc->is16bit);
+    SSMR3PutU8(pSSM, dc->u8Status);
+    SSMR3PutU8(pSSM, dc->u8Temp);
+    SSMR3PutU8(pSSM, dc->u8ModeCtr);
+    SSMR3PutMem(pSSM, &dc->au8Page, sizeof(dc->au8Page));
+    SSMR3PutMem(pSSM, &dc->au8PageHi, sizeof(dc->au8PageHi));
 
     /* ...and all four of its channels. */
@@ -847 +847 @@
         DMAChannel  *ch = &dc->ChState[chidx];
 
-        SSMR3PutU16(pSSMHandle, ch->u16CurAddr);
-        SSMR3PutU16(pSSMHandle, ch->u16CurCount);
-        SSMR3PutU16(pSSMHandle, ch->u16BaseAddr);
-        SSMR3PutU16(pSSMHandle, ch->u16BaseCount);
-        SSMR3PutU8(pSSMHandle, ch->u8Mode);
-    }
-}
-
-static int dmaLoadController(PSSMHANDLE pSSMHandle, DMAControl *dc, int version)
+        SSMR3PutU16(pSSM, ch->u16CurAddr);
+        SSMR3PutU16(pSSM, ch->u16CurCount);
+        SSMR3PutU16(pSSM, ch->u16BaseAddr);
+        SSMR3PutU16(pSSM, ch->u16BaseCount);
+        SSMR3PutU8(pSSM, ch->u8Mode);
+    }
+}
+
+static int dmaLoadController(PSSMHANDLE pSSM, DMAControl *dc, int version)
 {
     uint8_t     u8val;
@@ -861 +861 @@
     int         chidx;
 
-    SSMR3GetU8(pSSMHandle, &dc->u8Command);
-    SSMR3GetU8(pSSMHandle, &dc->u8Mask);
-    SSMR3GetU8(pSSMHandle, &u8val);
+    SSMR3GetU8(pSSM, &dc->u8Command);
+    SSMR3GetU8(pSSM, &dc->u8Mask);
+    SSMR3GetU8(pSSM, &u8val);
     dc->fHiByte = !!u8val;
-    SSMR3GetU32(pSSMHandle, &dc->is16bit);
+    SSMR3GetU32(pSSM, &dc->is16bit);
     if (version > DMA_SAVESTATE_OLD)
     {
-        SSMR3GetU8(pSSMHandle, &dc->u8Status);
-        SSMR3GetU8(pSSMHandle, &dc->u8Temp);
-        SSMR3GetU8(pSSMHandle, &dc->u8ModeCtr);
-        SSMR3GetMem(pSSMHandle, &dc->au8Page, sizeof(dc->au8Page));
-        SSMR3GetMem(pSSMHandle, &dc->au8PageHi, sizeof(dc->au8PageHi));
+        SSMR3GetU8(pSSM, &dc->u8Status);
+        SSMR3GetU8(pSSM, &dc->u8Temp);
+        SSMR3GetU8(pSSM, &dc->u8ModeCtr);
+        SSMR3GetMem(pSSM, &dc->au8Page, sizeof(dc->au8Page));
+        SSMR3GetMem(pSSM, &dc->au8PageHi, sizeof(dc->au8PageHi));
     }
 
@@ -882 +882 @@
         {
             /* Convert from 17-bit to 16-bit format. */
-            SSMR3GetU32(pSSMHandle, &u32val);
+            SSMR3GetU32(pSSM, &u32val);
             ch->u16CurAddr = u32val >> dc->is16bit;
-            SSMR3GetU32(pSSMHandle, &u32val);
+            SSMR3GetU32(pSSM, &u32val);
             ch->u16CurCount = u32val >> dc->is16bit;
         }
         else
         {
-            SSMR3GetU16(pSSMHandle, &ch->u16CurAddr);
-            SSMR3GetU16(pSSMHandle, &ch->u16CurCount);
+            SSMR3GetU16(pSSM, &ch->u16CurAddr);
+            SSMR3GetU16(pSSM, &ch->u16CurCount);
         }
-        SSMR3GetU16(pSSMHandle, &ch->u16BaseAddr);
-        SSMR3GetU16(pSSMHandle, &ch->u16BaseCount);
-        SSMR3GetU8(pSSMHandle, &ch->u8Mode);
+        SSMR3GetU16(pSSM, &ch->u16BaseAddr);
+        SSMR3GetU16(pSSM, &ch->u16BaseCount);
+        SSMR3GetU8(pSSM, &ch->u8Mode);
         /* Convert from old save state. */
         if (version == DMA_SAVESTATE_OLD)
         {
             /* Remap page register contents. */
-            SSMR3GetU8(pSSMHandle, &u8val);
+            SSMR3GetU8(pSSM, &u8val);
             dc->au8Page[DMACX2PG(chidx)] = u8val;
-            SSMR3GetU8(pSSMHandle, &u8val);
+            SSMR3GetU8(pSSM, &u8val);
             dc->au8PageHi[DMACX2PG(chidx)] = u8val;
             /* Throw away dack, eop. */
-            SSMR3GetU8(pSSMHandle, &u8val);
-            SSMR3GetU8(pSSMHandle, &u8val);
+            SSMR3GetU8(pSSM, &u8val);
+            SSMR3GetU8(pSSM, &u8val);
         }
     }
@@ -912 +912 @@
 
 /** @callback_method_impl{FNSSMDEVSAVEEXEC}  */
-static DECLCALLBACK(int) dmaSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
+static DECLCALLBACK(int) dmaSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
     DMAState *pThis = PDMINS_2_DATA(pDevIns, DMAState *);
 
-    dmaSaveController(pSSMHandle, &pThis->DMAC[0]);
-    dmaSaveController(pSSMHandle, &pThis->DMAC[1]);
+    dmaSaveController(pSSM, &pThis->DMAC[0]);
+    dmaSaveController(pSSM, &pThis->DMAC[1]);
     return VINF_SUCCESS;
 }
 
 /** @callback_method_impl{FNSSMDEVLOADEXEC}  */
-static DECLCALLBACK(int) dmaLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t uVersion, uint32_t uPass)
+static DECLCALLBACK(int) dmaLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
     DMAState *pThis = PDMINS_2_DATA(pDevIns, DMAState *);
@@ -929 +929 @@
     Assert(uPass == SSM_PASS_FINAL); NOREF(uPass);
 
-    dmaLoadController(pSSMHandle, &pThis->DMAC[0], uVersion);
-    return dmaLoadController(pSSMHandle, &pThis->DMAC[1], uVersion);
+    dmaLoadController(pSSM, &pThis->DMAC[0], uVersion);
+    return dmaLoadController(pSSM, &pThis->DMAC[1], uVersion);
 }
 

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

@@ -767 +767 @@
 
 /**
- * @callback_method_impl{FNDBGFINFOHANDLERDEV}
+ * @callback_method_impl{FNDBGFHANDLERDEV}
  */
 static DECLCALLBACK(void) picInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)