Changeset 12969 in vbox for trunk/src/VBox/Devices/PC/DevAPIC.cpp

Timestamp:

Oct 3, 2008 7:03:26 AM (17 years ago)

Author:

vboxsync

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

37402

Message:

#1865: PDMINS.

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (6 diffs)

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

@@ -322 +322 @@
 DECLINLINE(void) cpuSetInterrupt(APICDeviceInfo* dev, APICState *s)
 {
-    dev->CTX_SUFF(pApicHlp)->pfnSetInterruptFF(dev->CTX_SUFF(pDevIns), 
+    dev->CTX_SUFF(pApicHlp)->pfnSetInterruptFF(dev->CTX_SUFF(pDevIns),
                                                getCpuFromLapic(dev, s));
 }
@@ -328 +328 @@
 DECLINLINE(void) cpuClearInterrupt(APICDeviceInfo* dev, APICState *s)
 {
-    dev->CTX_SUFF(pApicHlp)->pfnClearInterruptFF(dev->CTX_SUFF(pDevIns), 
+    dev->CTX_SUFF(pApicHlp)->pfnClearInterruptFF(dev->CTX_SUFF(pDevIns),
                                                  getCpuFromLapic(dev, s));
 }
@@ -1559 +1559 @@
             default:
                 index = (s->ioregsel - 0x10) >> 1;
-                if (index >= 0 && index < IOAPIC_NUM_PINS) {                    
+                if (index >= 0 && index < IOAPIC_NUM_PINS) {
                     if (s->ioregsel & 1) {
                         s->ioredtbl[index] &= 0xffffffff;
@@ -1576 +1576 @@
                         {
                             /*
-                             * Linux 2.6 kernels has pretty strange function 
+                             * Linux 2.6 kernels has pretty strange function
                              * unlock_ExtINT_logic() which writes
                              * absolutely bogus (all 0) value into the vector
@@ -1987 +1987 @@
     }
 
-    Assert(pDevIns->pDevHlp->pfnAPICRegister);
-    rc = pDevIns->pDevHlp->pfnAPICRegister(pDevIns, &ApicReg, &pThis->pApicHlpR3);
+    Assert(pDevIns->pDevHlpR3->pfnAPICRegister);
+    rc = pDevIns->pDevHlpR3->pfnAPICRegister(pDevIns, &ApicReg, &pThis->pApicHlpR3);
     if (RT_FAILURE(rc))
     {
@@ -2286 +2286 @@
     IoApicReg.pszSetIrqRC = fGCEnabled ? "ioapicSetIrq" : NULL;
     IoApicReg.pszSetIrqR0 = fR0Enabled ? "ioapicSetIrq" : NULL;
-    rc = pDevIns->pDevHlp->pfnIOAPICRegister(pDevIns, &IoApicReg, &s->pIoApicHlpR3);
+    rc = pDevIns->pDevHlpR3->pfnIOAPICRegister(pDevIns, &IoApicReg, &s->pIoApicHlpR3);
     if (RT_FAILURE(rc))
     {