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

Timestamp:

Feb 13, 2013 11:22:36 PM (12 years ago)

Author:

vboxsync

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

83774

Message:

DevIoApic.cpp: Small cleanups.

File:

• trunk/src/VBox/Devices/PC/DevIoApic.cpp (modified) (18 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2013 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -79 +79 @@
 *   Structures and Typedefs                                                    *
 *******************************************************************************/
-struct IOAPICState
+typedef struct IOAPIC
 {
     uint8_t                 id;
@@ -113 +113 @@
     STAMCOUNTER             StatSetIrqHC;
 # endif
-};
-
-typedef struct IOAPICState IOAPICState;
+} IOAPIC;
+typedef IOAPIC *PIOAPIC;
 
 #ifndef VBOX_DEVICE_STRUCT_TESTCASE
@@ -124 +123 @@
 
 
-static void ioapic_service(IOAPICState *pThis)
+static void ioapic_service(PIOAPIC pThis)
 {
     uint8_t i;
@@ -181 +180 @@
 
 
-static void ioapic_set_irq(void *opaque, int vector, int level, uint32_t uTagSrc)
-{
-    IOAPICState *pThis = (IOAPICState*)opaque;
-
+static void ioapic_set_irq(PIOAPIC pThis, int vector, int level, uint32_t uTagSrc)
+{
     if (vector >= 0 && vector < IOAPIC_NUM_PINS)
     {
@@ -232 +229 @@
 }
 
-static uint32_t ioapic_mem_readl(void *opaque, RTGCPHYS addr)
-{
-    IOAPICState *pThis = (IOAPICState*)opaque;
+static uint32_t ioapic_mem_readl(PIOAPIC pThis, RTGCPHYS addr)
+{
     uint32_t val = 0;
 
@@ -280 +276 @@
 }
 
-static void ioapic_mem_writel(void *opaque, RTGCPHYS addr, uint32_t val)
-{
-    IOAPICState *pThis = (IOAPICState*)opaque;
+static void ioapic_mem_writel(PIOAPIC pThis, RTGCPHYS addr, uint32_t val)
+{
     int index;
 
@@ -348 +343 @@
 PDMBOTHCBDECL(int) ioapicMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     IOAPIC_LOCK(pThis, VINF_IOM_R3_MMIO_READ);
 
@@ -377 +372 @@
 PDMBOTHCBDECL(int) ioapicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void const *pv, unsigned cb)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
 
     STAM_COUNTER_INC(&CTXSUFF(pThis->StatMMIOWrite));
@@ -399 +394 @@
 {
     /* PDM lock is taken here; */ /** @todo add assertion */
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     STAM_COUNTER_INC(&pThis->CTXSUFF(StatSetIrq));
     LogFlow(("ioapicSetIrq: iIrq=%d iLevel=%d uTagSrc=%#x\n", iIrq, iLevel, uTagSrc));
@@ -407 +402 @@
 PDMBOTHCBDECL(void) ioapicSendMsi(PPDMDEVINS pDevIns, RTGCPHYS GCAddr, uint32_t uValue, uint32_t uTagSrc)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
 
     LogFlow(("ioapicSendMsi: Address=%p uValue=%\n", GCAddr, uValue));
@@ -448 +443 @@
 static DECLCALLBACK(void) ioapicInfo(PPDMDEVINS pDevIns, PCDBGFINFOHLP pHlp, const char *pszArgs)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     uint32_t     uVal;
 
@@ -494 +489 @@
 static DECLCALLBACK(int) ioapicSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
 
     SSMR3PutU8(pSSM, pThis->id);
@@ -509 +504 @@
 static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSM, uint32_t uVersion, uint32_t uPass)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     if (uVersion != 1)
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
@@ -527 +522 @@
 static DECLCALLBACK(void) ioapicReset(PPDMDEVINS pDevIns)
 {
-    IOAPICState        *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     pThis->pIoApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
 
@@ -547 +542 @@
 static DECLCALLBACK(void) ioapicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     pThis->pDevInsRC    = PDMDEVINS_2_RCPTR(pDevIns);
     pThis->pIoApicHlpRC = pThis->pIoApicHlpR3->pfnGetRCHelpers(pDevIns);
@@ -557 +552 @@
 static DECLCALLBACK(int) ioapicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfg)
 {
-    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
+    PIOAPIC pThis = PDMINS_2_DATA(pDevIns, PIOAPIC);
     Assert(iInstance == 0);
 
@@ -686 +681 @@
     1,
     /* cbInstance */
-    sizeof(IOAPICState),
+    sizeof(IOAPIC),
     /* pfnConstruct */
     ioapicConstruct,