Changeset 20056 in vbox for trunk/src/VBox/Devices

Timestamp:

May 27, 2009 7:33:15 AM (16 years ago)

Author:

vboxsync

Message:

Backed out 47770 & 47771 (failed experiment)

File:

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

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

@@ -438 +438 @@
 PDMBOTHCBDECL(void) apicSetBase(PPDMDEVINS pDevIns, uint64_t val);
 PDMBOTHCBDECL(uint64_t) apicGetBase(PPDMDEVINS pDevIns);
-PDMBOTHCBDECL(void) apicSetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t val, bool fMMIOFormat);
-PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, bool fMMIOFormat);
+PDMBOTHCBDECL(void) apicSetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t val);
+PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu);
 PDMBOTHCBDECL(int)  apicBusDeliverCallback(PPDMDEVINS pDevIns, uint8_t u8Dest, uint8_t u8DestMode,
                                            uint8_t u8DeliveryMode, uint8_t iVector, uint8_t u8Polarity,
@@ -670 +670 @@
 }
 
-PDMBOTHCBDECL(void) apicSetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t val, bool fMMIOFormat)
+PDMBOTHCBDECL(void) apicSetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, uint8_t val)
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
     APICState *s = getLapicById(dev, idCpu);
-
-    if (!fMMIOFormat)
-        val = (val & 0x0f) << 4;
-
-    LogFlow(("apicSetTPR: val=%#x (trp %#x -> %#x)\n", val, s->tpr, val));
-    apic_update_tpr(dev, s, val);
-}
-
-PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu, bool fMMIOFormat)
+    LogFlow(("apicSetTPR: val=%#x (trp %#x -> %#x)\n", val, s->tpr, (val & 0x0f) << 4));
+    apic_update_tpr(dev, s, (val & 0x0f) << 4);
+}
+
+PDMBOTHCBDECL(uint8_t) apicGetTPR(PPDMDEVINS pDevIns, VMCPUID idCpu)
 {
     APICDeviceInfo *dev = PDMINS_2_DATA(pDevIns, APICDeviceInfo *);
     APICState *s = getLapicById(dev, idCpu);
-
-    if (fMMIOFormat)
-    {
-        Log2(("apicGetTPR: returns %#x\n", s->tpr));
-        return s->tpr;
-    }
-    else
-    {
-        Log2(("apicGetTPR: returns %#x\n", s->tpr >> 4));
-        return s->tpr >> 4;
-    }
+    Log2(("apicGetTPR: returns %#x\n", s->tpr >> 4));
+    return s->tpr >> 4;
 }