vbox的更動 11223 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-8-7 下午06:12:47 (16 年 以前)

作者:

vboxsync

訊息:

DevAPIC: cosmetics.

檔案:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (修改) (23 筆差異)

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

@@ -364 +364 @@
 PDMBOTHCBDECL(void) apicSetBase(PPDMDEVINS pDevIns, uint64_t val)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     Log(("cpu_set_apic_base: %016RX64\n", val));
 
@@ -446 +446 @@
 PDMBOTHCBDECL(uint64_t) apicGetBase(PPDMDEVINS pDevIns)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     Log(("apicGetBase: %016llx\n", (uint64_t)s->apicbase));
     return s->apicbase;
@@ -453 +453 @@
 PDMBOTHCBDECL(void) apicSetTPR(PPDMDEVINS pDevIns, uint8_t val)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     LogFlow(("apicSetTPR: val=%#x (trp %#x -> %#x)\n", val, s->tpr, (val & 0x0f) << 4));
     apic_update_tpr(s, (val & 0x0f) << 4);
@@ -460 +460 @@
 PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     Log2(("apicGetTPR: returns %#x\n", s->tpr >> 4));
     return s->tpr >> 4;
@@ -473 +473 @@
                                            uint8_t u8TriggerMode)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     LogFlow(("apicBusDeliverCallback: s=%p pDevIns=%p u8Dest=%#x u8DestMode=%#x u8DeliveryMode=%#x iVector=%#x u8Polarity=%#x u8TriggerMode=%#x\n",
              s, pDevIns, u8Dest, u8DestMode, u8DeliveryMode, iVector, u8Polarity, u8TriggerMode));
@@ -565 +565 @@
     int irrv, ppr;
 
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     if (!s)
         return false;
@@ -767 +767 @@
 PDMBOTHCBDECL(int) apicGetInterrupt(PPDMDEVINS pDevIns)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
 #endif /* VBOX */
     int intno;
@@ -861 +861 @@
 static DECLCALLBACK(void) apicTimer(PPDMDEVINS pDevIns, PTMTIMER pTimer)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
 #endif /* VBOX */
@@ -1541 +1541 @@
 PDMBOTHCBDECL(int) apicMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
 
     STAM_COUNTER_INC(&CTXSUFF(s->StatMMIORead));
@@ -1587 +1587 @@
 PDMBOTHCBDECL(int) apicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
 
     STAM_COUNTER_INC(&CTXSUFF(s->StatMMIOWrite));
@@ -1620 +1620 @@
 static DECLCALLBACK(int) apicSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     apic_save(pSSMHandle, s);
     return TMR3TimerSave(s->CTX_SUFF(pTimer), pSSMHandle);
@@ -1630 +1630 @@
 static DECLCALLBACK(int) apicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     if (apic_load(pSSMHandle, s, u32Version)) {
         AssertFailed();
@@ -1643 +1643 @@
 static DECLCALLBACK(void) apicReset(PPDMDEVINS pDevIns)
 {
-    APICState *s = PDMINS2DATA(pDevIns, APICState *);
+    APICState *s = PDMINS_2_DATA(pDevIns, APICState *);
     s->pApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
     apic_reset(s);
@@ -1656 +1656 @@
 static DECLCALLBACK(void) apicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    APICState *pData = PDMINS2DATA(pDevIns, APICState *);
+    APICState *pData = PDMINS_2_DATA(pDevIns, APICState *);
     pData->pDevInsRC  = PDMDEVINS_2_RCPTR(pDevIns);
     pData->pApicHlpRC = pData->pApicHlpR3->pfnGetRCHelpers(pDevIns);
@@ -1667 +1667 @@
 static DECLCALLBACK(int) apicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    APICState      *pData = PDMINS2DATA(pDevIns, APICState *);
+    APICState      *pData = PDMINS_2_DATA(pDevIns, APICState *);
     PDMAPICREG      ApicReg;
     int             rc;
@@ -1898 +1898 @@
 PDMBOTHCBDECL(int) ioapicMMIORead(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     IOAPIC_LOCK(s, VINF_IOM_HC_MMIO_READ);
 
@@ -1927 +1927 @@
 PDMBOTHCBDECL(int) ioapicMMIOWrite(PPDMDEVINS pDevIns, void *pvUser, RTGCPHYS GCPhysAddr, void *pv, unsigned cb)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
 
     STAM_COUNTER_INC(&CTXSUFF(s->StatMMIOWrite));
@@ -1949 +1949 @@
 PDMBOTHCBDECL(void) ioapicSetIrq(PPDMDEVINS pDevIns, int iIrq, int iLevel)
 {
-    IOAPICState *pThis = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *pThis = PDMINS_2_DATA(pDevIns, IOAPICState *);
     STAM_COUNTER_INC(&pThis->CTXSUFF(StatSetIrq));
     LogFlow(("ioapicSetIrq: iIrq=%d iLevel=%d\n", iIrq, iLevel));
@@ -1963 +1963 @@
 static DECLCALLBACK(int) ioapicSaveExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     ioapic_save(pSSMHandle, s);
     return VINF_SUCCESS;
@@ -1973 +1973 @@
 static DECLCALLBACK(int) ioapicLoadExec(PPDMDEVINS pDevIns, PSSMHANDLE pSSMHandle, uint32_t u32Version)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
 
     if (ioapic_load(pSSMHandle, s, u32Version)) {
@@ -1988 +1988 @@
 static DECLCALLBACK(void) ioapicReset(PPDMDEVINS pDevIns)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     s->pIoApicHlpR3->pfnLock(pDevIns, VERR_INTERNAL_ERROR);
     ioapic_reset(s);
@@ -1999 +1999 @@
 static DECLCALLBACK(void) ioapicRelocate(PPDMDEVINS pDevIns, RTGCINTPTR offDelta)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     s->pDevInsRC    = PDMDEVINS_2_RCPTR(pDevIns);
     s->pIoApicHlpRC = s->pIoApicHlpR3->pfnGetRCHelpers(pDevIns);
@@ -2009 +2009 @@
 static DECLCALLBACK(int) ioapicConstruct(PPDMDEVINS pDevIns, int iInstance, PCFGMNODE pCfgHandle)
 {
-    IOAPICState *s = PDMINS2DATA(pDevIns, IOAPICState *);
+    IOAPICState *s = PDMINS_2_DATA(pDevIns, IOAPICState *);
     PDMIOAPICREG IoApicReg;
     bool         fGCEnabled;